From df3259810c60ceeeee56cd288aee49b77804fdd1 Mon Sep 17 00:00:00 2001 From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498> Date: Sun, 25 Jul 2010 21:42:08 +0000 Subject: [PATCH] --- Setup2/Cosmos.iss | 8 +- source2/VSIP/Cosmos.VS.Package/BuildPage.cs | 101 +++++++------- .../Cosmos.VS.Package.csproj | 38 +++--- .../DebugOptionsPropertyPage.Designer.cs | 69 ---------- .../DebugOptionsPropertyPage.cs | 126 ------------------ ...e.Designer.cs => DebugPageSub.Designer.cs} | 2 +- .../{DebugPage.cs => DebugPageSub.cs} | 4 +- ...onsPropertyPage.resx => DebugPageSub.resx} | 0 source2/VSIP/Cosmos.VS.Package/Guids.cs | 2 +- .../VSIP/Cosmos.VS.Package/VMOptionsQemu.resx | 120 ----------------- ...rtyPage.Designer.cs => VMPage.Designer.cs} | 2 +- .../{VMOptionsPropertyPage.cs => VMPage.cs} | 10 +- .../{DebugPage.resx => VMPage.resx} | 0 ...emu.Designer.cs => VMPageQemu.Designer.cs} | 2 +- .../{VMOptionsQemu.cs => VMPageQemu.cs} | 4 +- ...tionsPropertyPage.resx => VMPageQemu.resx} | 0 source2/VSIP/Cosmos.VS.Package/VSProject.cs | 4 +- .../VSIP/Cosmos.VS.Package/VSProjectNode.cs | 4 +- 18 files changed, 85 insertions(+), 411 deletions(-) delete mode 100644 source2/VSIP/Cosmos.VS.Package/DebugOptionsPropertyPage.Designer.cs delete mode 100644 source2/VSIP/Cosmos.VS.Package/DebugOptionsPropertyPage.cs rename source2/VSIP/Cosmos.VS.Package/{DebugPage.Designer.cs => DebugPageSub.Designer.cs} (97%) rename source2/VSIP/Cosmos.VS.Package/{DebugPage.cs => DebugPageSub.cs} (93%) rename source2/VSIP/Cosmos.VS.Package/{DebugOptionsPropertyPage.resx => DebugPageSub.resx} (100%) delete mode 100644 source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.resx rename source2/VSIP/Cosmos.VS.Package/{VMOptionsPropertyPage.Designer.cs => VMPage.Designer.cs} (96%) rename source2/VSIP/Cosmos.VS.Package/{VMOptionsPropertyPage.cs => VMPage.cs} (88%) rename source2/VSIP/Cosmos.VS.Package/{DebugPage.resx => VMPage.resx} (100%) rename source2/VSIP/Cosmos.VS.Package/{VMOptionsQemu.Designer.cs => VMPageQemu.Designer.cs} (98%) rename source2/VSIP/Cosmos.VS.Package/{VMOptionsQemu.cs => VMPageQemu.cs} (93%) rename source2/VSIP/Cosmos.VS.Package/{VMOptionsPropertyPage.resx => VMPageQemu.resx} (100%) diff --git a/Setup2/Cosmos.iss b/Setup2/Cosmos.iss index 4239d603b..77e6784ae 100644 --- a/Setup2/Cosmos.iss +++ b/Setup2/Cosmos.iss @@ -164,14 +164,14 @@ Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{d33a2d29-c4fd-4e Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{d33a2d29-c4fd-4e12-a510-4c01a14d63e1}; ValueType: string; ValueName: Class; ValueData: Cosmos.VS.Package.BuildPage Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{d33a2d29-c4fd-4e12-a510-4c01a14d63e1}; ValueType: string; ValueName: CodeBase; ValueData: {app}\build\vsip\cosmos.vs.package.dll Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{d33a2d29-c4fd-4e12-a510-4c01a14d63e1}; ValueType: string; ValueName: ThreadingModel; ValueData: Both -Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{39801176-289f-405f-9425-2931a2c03912}; ValueType: string; ValueName: ; ValueData: Cosmos.VS.Package.DebugOptionsPropertyPage +Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{39801176-289f-405f-9425-2931a2c03912}; ValueType: string; ValueName: ; ValueData: Cosmos.VS.Package.DebugPage Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{39801176-289f-405f-9425-2931a2c03912}; ValueType: string; ValueName: InprocServer32; ValueData: {sys}\MSCOREE.DLL -Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{39801176-289f-405f-9425-2931a2c03912}; ValueType: string; ValueName: Class; ValueData: Cosmos.VS.Package.DebugOptionsPropertyPage +Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{39801176-289f-405f-9425-2931a2c03912}; ValueType: string; ValueName: Class; ValueData: Cosmos.VS.Package.DebugPage Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{39801176-289f-405f-9425-2931a2c03912}; ValueType: string; ValueName: CodeBase; ValueData: {app}\build\vsip\cosmos.vs.package.dll Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{39801176-289f-405f-9425-2931a2c03912}; ValueType: string; ValueName: ThreadingModel; ValueData: Both -Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{3b72bb68-7363-45a2-9eba-55c8d5f36e36}; ValueType: string; ValueName: ; ValueData: Cosmos.VS.Package.VMOptionsPropertyPage +Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{3b72bb68-7363-45a2-9eba-55c8d5f36e36}; ValueType: string; ValueName: ; ValueData: Cosmos.VS.Package.VMPage Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{3b72bb68-7363-45a2-9eba-55c8d5f36e36}; ValueType: string; ValueName: InprocServer32; ValueData: {sys}\MSCOREE.DLL -Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{3b72bb68-7363-45a2-9eba-55c8d5f36e36}; ValueType: string; ValueName: Class; ValueData: Cosmos.VS.Package.VMOptionsPropertyPage +Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{3b72bb68-7363-45a2-9eba-55c8d5f36e36}; ValueType: string; ValueName: Class; ValueData: Cosmos.VS.Package.VMPage Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{3b72bb68-7363-45a2-9eba-55c8d5f36e36}; ValueType: string; ValueName: CodeBase; ValueData: {app}\build\vsip\cosmos.vs.package.dll Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\CLSID\{{3b72bb68-7363-45a2-9eba-55c8d5f36e36}; ValueType: string; ValueName: ThreadingModel; ValueData: Both Root: HKLM; SubKey: Software\Microsoft\VisualStudio\9.0\Projects\{{471ec4bb-e47e-4229-a789-d1f5f83b52d4}; ValueType: string; ValueName: ; ValueData: VSProjectFactory diff --git a/source2/VSIP/Cosmos.VS.Package/BuildPage.cs b/source2/VSIP/Cosmos.VS.Package/BuildPage.cs index faef26ac1..981993aad 100644 --- a/source2/VSIP/Cosmos.VS.Package/BuildPage.cs +++ b/source2/VSIP/Cosmos.VS.Package/BuildPage.cs @@ -11,18 +11,16 @@ using Cosmos.Build.Common; using Microsoft.VisualStudio.Project; using Microsoft.VisualStudio; -namespace Cosmos.VS.Package -{ +namespace Cosmos.VS.Package { [Guid(Guids.BuildPage)] - public partial class BuildPage : ConfigurationBase - { + public partial class BuildPage : ConfigurationBase { public static TargetHost CurrentBuildTarget = (TargetHost)(-1); public static event EventHandler BuildTargetChanged; - protected static void OnBuildTargetChanged(Object sender, EventArgs e) - { - if (BuildPage.BuildTargetChanged != null) - { BuildPage.BuildTargetChanged(sender, e); } + protected static void OnBuildTargetChanged(Object sender, EventArgs e) { + if (BuildPage.BuildTargetChanged != null) { + BuildPage.BuildTargetChanged(sender, e); + } } private BuildProperties projProperties; @@ -31,12 +29,12 @@ namespace Cosmos.VS.Package { InitializeComponent(); - this.comboTarget.Items.AddRange(EnumValue.GetEnumValues(typeof(TargetHost))); - this.comboFramework.Items.AddRange(EnumValue.GetEnumValues(typeof(Framework))); + comboTarget.Items.AddRange(EnumValue.GetEnumValues(typeof(TargetHost))); + comboFramework.Items.AddRange(EnumValue.GetEnumValues(typeof(Framework))); - this.projProperties = new BuildProperties(); + projProperties = new BuildProperties(); - this.CreateUIMonitorEvents(); + CreateUIMonitorEvents(); } private void CreateUIMonitorEvents() @@ -46,8 +44,8 @@ namespace Cosmos.VS.Package String value = this.textOutputPath.Text; if (String.Equals(value, this.PageProperties.OutputPath, StringComparison.InvariantCultureIgnoreCase) == false) { - this.PageProperties.OutputPath = this.textOutputPath.Text; - this.IsDirty = true; + PageProperties.OutputPath = this.textOutputPath.Text; + IsDirty = true; } }; @@ -56,8 +54,8 @@ namespace Cosmos.VS.Package TargetHost value = (TargetHost)((EnumValue)this.comboTarget.SelectedItem).Value; if( value != this.PageProperties.Target) { - this.PageProperties.Target = value; - this.IsDirty = true; + PageProperties.Target = value; + IsDirty = true; BuildPage.CurrentBuildTarget = value; BuildPage.OnBuildTargetChanged(this, EventArgs.Empty); @@ -69,8 +67,8 @@ namespace Cosmos.VS.Package Framework value = (Framework)((EnumValue)this.comboFramework.SelectedItem).Value; if (value != this.PageProperties.Framework) { - this.PageProperties.Framework = value; - this.IsDirty = true; + PageProperties.Framework = value; + IsDirty = true; } }; @@ -79,8 +77,8 @@ namespace Cosmos.VS.Package Boolean value = this.checkUseInternalAssembler.Checked; if (value != this.PageProperties.UseInternalAssembler) { - this.PageProperties.UseInternalAssembler = value; - this.IsDirty = true; + PageProperties.UseInternalAssembler = value; + IsDirty = true; } }; } @@ -95,31 +93,29 @@ namespace Cosmos.VS.Package { base.FillProperties(); - this.PageProperties.Reset(); + PageProperties.Reset(); + PageProperties.SetProperty("OutputPath", this.GetConfigProperty("OutputPath")); + PageProperties.SetProperty("BuildTarget", this.GetConfigProperty("BuildTarget")); + PageProperties.SetProperty("Framework", this.GetConfigProperty("Framework")); + PageProperties.SetProperty("UseInternalAssembler", this.GetConfigProperty("UseInternalAssembler")); - this.PageProperties.SetProperty("OutputPath", this.GetConfigProperty("OutputPath")); - this.PageProperties.SetProperty("BuildTarget", this.GetConfigProperty("BuildTarget")); - this.PageProperties.SetProperty("Framework", this.GetConfigProperty("Framework")); - this.PageProperties.SetProperty("UseInternalAssembler", this.GetConfigProperty("UseInternalAssembler")); - - this.textOutputPath.Text = this.PageProperties.OutputPath; - this.comboTarget.SelectedItem = EnumValue.Find(this.comboTarget.Items, this.PageProperties.Target); - this.comboFramework.SelectedItem = EnumValue.Find(this.comboFramework.Items, this.PageProperties.Framework); - this.checkUseInternalAssembler.Checked = this.PageProperties.UseInternalAssembler; + textOutputPath.Text = this.PageProperties.OutputPath; + comboTarget.SelectedItem = EnumValue.Find(this.comboTarget.Items, this.PageProperties.Target); + comboFramework.SelectedItem = EnumValue.Find(this.comboFramework.Items, this.PageProperties.Framework); + checkUseInternalAssembler.Checked = this.PageProperties.UseInternalAssembler; } private void OutputBrowse_Click(object sender, EventArgs e) { String folderPath = String.Empty; - FolderBrowserDialog dialog; - dialog = new FolderBrowserDialog(); + var dialog = new FolderBrowserDialog(); dialog.ShowNewFolderButton = true; folderPath = textOutputPath.Text; - if ((String.IsNullOrEmpty(folderPath) == false) && (folderPath.IndexOfAny(System.IO.Path.GetInvalidPathChars()) == -1)) - { - if (System.IO.Path.IsPathRooted(folderPath) == false) - { folderPath = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(this.Project.FullName), folderPath); } + if ((String.IsNullOrEmpty(folderPath) == false) && (folderPath.IndexOfAny(System.IO.Path.GetInvalidPathChars()) == -1)) { + if (System.IO.Path.IsPathRooted(folderPath) == false) { + folderPath = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(this.Project.FullName), folderPath); + } while ((System.IO.Directory.Exists(folderPath) == false) && (String.IsNullOrEmpty(folderPath) == false)) { @@ -128,14 +124,16 @@ namespace Cosmos.VS.Package if (index > -1) { folderPath = folderPath.Substring(0, index - 1); - } else { folderPath = String.Empty; } + } else { + folderPath = String.Empty; + } } - if (String.IsNullOrEmpty(folderPath) == true) - { folderPath = System.IO.Path.GetDirectoryName(this.Project.FullName); } - } else - { - folderPath = System.IO.Path.GetDirectoryName(this.Project.FullName); + if (String.IsNullOrEmpty(folderPath) == true) { + folderPath = System.IO.Path.GetDirectoryName(Project.FullName); + } + } else { + folderPath = System.IO.Path.GetDirectoryName(Project.FullName); } dialog.SelectedPath = folderPath; @@ -146,20 +144,11 @@ namespace Cosmos.VS.Package } } - private void comboTarget_SelectedIndexChanged(object sender, EventArgs e) - { - try - { - var xEnumValue = (EnumValue)comboTarget.SelectedItem; - var xValue = (TargetHost)xEnumValue.Value; - if (!(xValue == TargetHost.VMWareWorkstation || xValue == TargetHost.QEMU)) - { - MessageBox.Show("The selected Target is temporarily not supported!"); - } - } - catch (Exception E) - { - File.AppendAllText(@"e:\cosmoserrors.txt", "ERROR\r\n" + E.ToString() + "\r\n\r\n\r\n"); + private void comboTarget_SelectedIndexChanged(object sender, EventArgs e) { + var xEnumValue = (EnumValue)comboTarget.SelectedItem; + var xValue = (TargetHost)xEnumValue.Value; + if (!(xValue == TargetHost.VMWareWorkstation || xValue == TargetHost.QEMU)) { + MessageBox.Show("This type is temporarily unsupported."); } } diff --git a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj index 1fd1a631b..ef7d356e0 100644 --- a/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj +++ b/source2/VSIP/Cosmos.VS.Package/Cosmos.VS.Package.csproj @@ -85,18 +85,18 @@ CustomPropertyPage.cs - - UserControl - - - DebugOptionsPropertyPage.cs - UserControl DebugPage.cs + + UserControl + + + DebugPageSub.cs + @@ -118,17 +118,17 @@ UnsavedConfigChangesDialog.cs - + UserControl - - VMOptionsPropertyPage.cs + + VMPage.cs - + UserControl - - VMOptionsQemu.cs + + VMPageQemu.cs @@ -157,12 +157,12 @@ CustomPropertyPage.cs - - DebugOptionsPropertyPage.cs - DebugPage.cs + + DebugPageSub.cs + SubPropertyPageBase.cs @@ -173,11 +173,11 @@ UnsavedConfigChangesDialog.cs - - VMOptionsPropertyPage.cs + + VMPage.cs - - VMOptionsQemu.cs + + VMPageQemu.cs diff --git a/source2/VSIP/Cosmos.VS.Package/DebugOptionsPropertyPage.Designer.cs b/source2/VSIP/Cosmos.VS.Package/DebugOptionsPropertyPage.Designer.cs deleted file mode 100644 index dfb4fb952..000000000 --- a/source2/VSIP/Cosmos.VS.Package/DebugOptionsPropertyPage.Designer.cs +++ /dev/null @@ -1,69 +0,0 @@ -namespace Cosmos.VS.Package -{ - partial class DebugOptionsPropertyPage - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.labelNoConfig = new System.Windows.Forms.Label(); - this.panelSubPage = new System.Windows.Forms.Panel(); - this.SuspendLayout(); - // - // labelNoConfig - // - this.labelNoConfig.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.labelNoConfig.ForeColor = System.Drawing.SystemColors.GrayText; - this.labelNoConfig.Location = new System.Drawing.Point(0, 41); - this.labelNoConfig.Name = "labelNoConfig"; - this.labelNoConfig.Size = new System.Drawing.Size(492, 16); - this.labelNoConfig.TabIndex = 1; - this.labelNoConfig.Text = ""; - this.labelNoConfig.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // panelSubPage - // - this.panelSubPage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panelSubPage.AutoScroll = true; - this.panelSubPage.Location = new System.Drawing.Point(0, 41); - this.panelSubPage.Margin = new System.Windows.Forms.Padding(0); - this.panelSubPage.Name = "panelSubPage"; - this.panelSubPage.Size = new System.Drawing.Size(492, 247); - this.panelSubPage.TabIndex = 3; - this.panelSubPage.Visible = false; - // - // DebugOptionsPropertyPage - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.panelSubPage); - this.Controls.Add(this.labelNoConfig); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F); - this.Name = "DebugOptionsPropertyPage"; - this.Title = "Debug"; - this.Controls.SetChildIndex(this.labelNoConfig, 0); - this.Controls.SetChildIndex(this.panelSubPage, 0); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Label labelNoConfig; - private System.Windows.Forms.Panel panelSubPage; - - - } -} diff --git a/source2/VSIP/Cosmos.VS.Package/DebugOptionsPropertyPage.cs b/source2/VSIP/Cosmos.VS.Package/DebugOptionsPropertyPage.cs deleted file mode 100644 index 478e1a963..000000000 --- a/source2/VSIP/Cosmos.VS.Package/DebugOptionsPropertyPage.cs +++ /dev/null @@ -1,126 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Windows.Forms; -using System.Runtime.InteropServices; -using Cosmos.Build.Common; - -namespace Cosmos.VS.Package -{ - [Guid(Guids.DebugPage)] - public partial class DebugOptionsPropertyPage : ConfigurationBase - { - - private SubPropertyPageBase pageSubPage; - - public DebugOptionsPropertyPage() : base() - { - InitializeComponent(); - - BuildPage.BuildTargetChanged += new EventHandler(BuildOptionsPropertyPage_BuildTargetChanged); - } - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - - BuildPage.BuildTargetChanged -= new EventHandler(BuildOptionsPropertyPage_BuildTargetChanged); - - base.Dispose(disposing); - } - - void BuildOptionsPropertyPage_BuildTargetChanged(object sender, EventArgs e) - { this.FillProperties(); } - - private void ClearSubPage() - { - foreach (Control control in this.panelSubPage.Controls) - { - this.panelSubPage.Controls.Remove(control); - control.Dispose(); - } - } - - private void SetSubPropertyPage(TargetHost target) - { - Boolean subpageChanged = false; - - switch (target) - { - case TargetHost.QEMU: - if ((this.pageSubPage is DebugPage) == false) - { - subpageChanged = true; - this.pageSubPage = new DebugPage(); - } - break; - default: - subpageChanged = true; - this.pageSubPage = null; - break; - } - - if( subpageChanged == true) - { - this.panelSubPage.SuspendLayout(); - - this.ClearSubPage(); - if (this.pageSubPage != null) - { - this.pageSubPage.SetOwner(this); - this.panelSubPage.Controls.Add(pageSubPage); - - this.pageSubPage.Location = new Point(0, 0); - this.pageSubPage.Anchor = AnchorStyles.Top; - - this.pageSubPage.Size = new Size(this.ClientSize.Width, this.pageSubPage.Size.Height); - this.pageSubPage.Anchor = this.pageSubPage.Anchor | AnchorStyles.Left | AnchorStyles.Right; - - if (this.pageSubPage.Size.Height <= this.ClientSize.Height) - { - this.pageSubPage.Size = new Size(this.pageSubPage.Size.Width, this.ClientSize.Height); - this.pageSubPage.Anchor = this.pageSubPage.Anchor | AnchorStyles.Bottom; - } - - this.panelSubPage.Visible = true; - } else { - this.panelSubPage.Visible = false; - } - - this.panelSubPage.ResumeLayout(); - } - - } - - protected override void FillProperties() - { - base.FillProperties(); - - this.SetSubPropertyPage(BuildPage.CurrentBuildTarget); - - if (this.pageSubPage != null) - { this.pageSubPage.FillProperties(); } - } - - public override PropertiesBase Properties - { - get - { - if (pageSubPage != null) - { return pageSubPage.Properties; } - return null; - } - } - } -} diff --git a/source2/VSIP/Cosmos.VS.Package/DebugPage.Designer.cs b/source2/VSIP/Cosmos.VS.Package/DebugPageSub.Designer.cs similarity index 97% rename from source2/VSIP/Cosmos.VS.Package/DebugPage.Designer.cs rename to source2/VSIP/Cosmos.VS.Package/DebugPageSub.Designer.cs index 3df67b241..5df24c4e7 100644 --- a/source2/VSIP/Cosmos.VS.Package/DebugPage.Designer.cs +++ b/source2/VSIP/Cosmos.VS.Package/DebugPageSub.Designer.cs @@ -1,6 +1,6 @@ namespace Cosmos.VS.Package { - partial class DebugPage + partial class DebugPageSub { /// /// Required designer variable. diff --git a/source2/VSIP/Cosmos.VS.Package/DebugPage.cs b/source2/VSIP/Cosmos.VS.Package/DebugPageSub.cs similarity index 93% rename from source2/VSIP/Cosmos.VS.Package/DebugPage.cs rename to source2/VSIP/Cosmos.VS.Package/DebugPageSub.cs index 87a76c74b..e6c8fe17e 100644 --- a/source2/VSIP/Cosmos.VS.Package/DebugPage.cs +++ b/source2/VSIP/Cosmos.VS.Package/DebugPageSub.cs @@ -10,11 +10,11 @@ using Cosmos.Build.Common; namespace Cosmos.VS.Package { - public partial class DebugPage : SubPropertyPageBase + public partial class DebugPageSub : SubPropertyPageBase { private DebugQemuProperties projProperties; - public DebugPage() + public DebugPageSub() { InitializeComponent(); diff --git a/source2/VSIP/Cosmos.VS.Package/DebugOptionsPropertyPage.resx b/source2/VSIP/Cosmos.VS.Package/DebugPageSub.resx similarity index 100% rename from source2/VSIP/Cosmos.VS.Package/DebugOptionsPropertyPage.resx rename to source2/VSIP/Cosmos.VS.Package/DebugPageSub.resx diff --git a/source2/VSIP/Cosmos.VS.Package/Guids.cs b/source2/VSIP/Cosmos.VS.Package/Guids.cs index a151370f5..8f1b3e78a 100644 --- a/source2/VSIP/Cosmos.VS.Package/Guids.cs +++ b/source2/VSIP/Cosmos.VS.Package/Guids.cs @@ -11,7 +11,7 @@ namespace Cosmos.VS.Package { // or GUIDs you need to update the .iss as well. public const string BuildPage = "d33a2d29-c4fd-4e12-a510-4c01a14d63e1"; public const string DebugPage = "39801176-289f-405f-9425-2931a2c03912"; - public const string VMOptionsPropertyPage = "3b72bb68-7363-45a2-9eba-55c8d5f36e36"; + public const string VMPage = "3b72bb68-7363-45a2-9eba-55c8d5f36e36"; public static readonly Guid guidProjectCmdSet = new Guid(guidProjectCmdSetString); public static readonly Guid guidProjectFactory = new Guid(guidProjectFactoryString); diff --git a/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.resx b/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.resx deleted file mode 100644 index ff31a6db5..000000000 --- a/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/source2/VSIP/Cosmos.VS.Package/VMOptionsPropertyPage.Designer.cs b/source2/VSIP/Cosmos.VS.Package/VMPage.Designer.cs similarity index 96% rename from source2/VSIP/Cosmos.VS.Package/VMOptionsPropertyPage.Designer.cs rename to source2/VSIP/Cosmos.VS.Package/VMPage.Designer.cs index 889a7b786..09cdd31a0 100644 --- a/source2/VSIP/Cosmos.VS.Package/VMOptionsPropertyPage.Designer.cs +++ b/source2/VSIP/Cosmos.VS.Package/VMPage.Designer.cs @@ -1,6 +1,6 @@ namespace Cosmos.VS.Package { - partial class VMOptionsPropertyPage + partial class VMPage { /// /// Required designer variable. diff --git a/source2/VSIP/Cosmos.VS.Package/VMOptionsPropertyPage.cs b/source2/VSIP/Cosmos.VS.Package/VMPage.cs similarity index 88% rename from source2/VSIP/Cosmos.VS.Package/VMOptionsPropertyPage.cs rename to source2/VSIP/Cosmos.VS.Package/VMPage.cs index ead197712..4a92b8c4c 100644 --- a/source2/VSIP/Cosmos.VS.Package/VMOptionsPropertyPage.cs +++ b/source2/VSIP/Cosmos.VS.Package/VMPage.cs @@ -11,12 +11,12 @@ using Cosmos.Build.Common; namespace Cosmos.VS.Package { - [Guid(Guids.VMOptionsPropertyPage)] - public partial class VMOptionsPropertyPage : ConfigurationBase + [Guid(Guids.VMPage)] + public partial class VMPage : ConfigurationBase { private SubPropertyPageBase pageSubPage; - public VMOptionsPropertyPage() { + public VMPage() { InitializeComponent(); BuildPage.BuildTargetChanged += new EventHandler(BuildOptionsPropertyPage_BuildTargetChanged); } @@ -56,10 +56,10 @@ namespace Cosmos.VS.Package switch (target) { case TargetHost.QEMU: - if ((this.pageSubPage is VMOptionsQemu) == false) + if ((this.pageSubPage is VMPageQemu) == false) { subpageChanged = true; - this.pageSubPage = new VMOptionsQemu(); + this.pageSubPage = new VMPageQemu(); } break; default: diff --git a/source2/VSIP/Cosmos.VS.Package/DebugPage.resx b/source2/VSIP/Cosmos.VS.Package/VMPage.resx similarity index 100% rename from source2/VSIP/Cosmos.VS.Package/DebugPage.resx rename to source2/VSIP/Cosmos.VS.Package/VMPage.resx diff --git a/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.Designer.cs b/source2/VSIP/Cosmos.VS.Package/VMPageQemu.Designer.cs similarity index 98% rename from source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.Designer.cs rename to source2/VSIP/Cosmos.VS.Package/VMPageQemu.Designer.cs index b0184e806..a8e185060 100644 --- a/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.Designer.cs +++ b/source2/VSIP/Cosmos.VS.Package/VMPageQemu.Designer.cs @@ -1,6 +1,6 @@ namespace Cosmos.VS.Package { - partial class VMOptionsQemu + partial class VMPageQemu { /// /// Required designer variable. diff --git a/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.cs b/source2/VSIP/Cosmos.VS.Package/VMPageQemu.cs similarity index 93% rename from source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.cs rename to source2/VSIP/Cosmos.VS.Package/VMPageQemu.cs index 45f297982..b22b3b3b8 100644 --- a/source2/VSIP/Cosmos.VS.Package/VMOptionsQemu.cs +++ b/source2/VSIP/Cosmos.VS.Package/VMPageQemu.cs @@ -11,11 +11,11 @@ using Cosmos.Build.Common; namespace Cosmos.VS.Package { - public partial class VMOptionsQemu : SubPropertyPageBase + public partial class VMPageQemu : SubPropertyPageBase { private Cosmos.Build.Common.VMQemuProperties projProperties; - public VMOptionsQemu() + public VMPageQemu() { InitializeComponent(); diff --git a/source2/VSIP/Cosmos.VS.Package/VMOptionsPropertyPage.resx b/source2/VSIP/Cosmos.VS.Package/VMPageQemu.resx similarity index 100% rename from source2/VSIP/Cosmos.VS.Package/VMOptionsPropertyPage.resx rename to source2/VSIP/Cosmos.VS.Package/VMPageQemu.resx diff --git a/source2/VSIP/Cosmos.VS.Package/VSProject.cs b/source2/VSIP/Cosmos.VS.Package/VSProject.cs index 4ade102ff..94ab50f66 100644 --- a/source2/VSIP/Cosmos.VS.Package/VSProject.cs +++ b/source2/VSIP/Cosmos.VS.Package/VSProject.cs @@ -50,8 +50,8 @@ namespace Cosmos.VS.Package { //[ProvideObject(typeof(PropPageEnvironment), RegisterUsing = RegistrationMethod.CodeBase)] //[ProvideObject(typeof(PropPageTest), RegisterUsing = RegistrationMethod.CodeBase)] [ProvideObject(typeof(BuildPage), RegisterUsing = RegistrationMethod.CodeBase)] - [ProvideObject(typeof(DebugOptionsPropertyPage), RegisterUsing = RegistrationMethod.CodeBase)] - [ProvideObject(typeof(VMOptionsPropertyPage), RegisterUsing = RegistrationMethod.CodeBase)] + [ProvideObject(typeof(DebugPage), RegisterUsing = RegistrationMethod.CodeBase)] + [ProvideObject(typeof(VMPage), RegisterUsing = RegistrationMethod.CodeBase)] [Guid(Guids.guidProjectPkgString)] public sealed class VSProject : ProjectPackage { /// diff --git a/source2/VSIP/Cosmos.VS.Package/VSProjectNode.cs b/source2/VSIP/Cosmos.VS.Package/VSProjectNode.cs index a693732e9..d3a097674 100644 --- a/source2/VSIP/Cosmos.VS.Package/VSProjectNode.cs +++ b/source2/VSIP/Cosmos.VS.Package/VSProjectNode.cs @@ -68,8 +68,8 @@ namespace Cosmos.VS.Package { // typeof(PropPageEnvironment).GUID, //typeof(PropPageTest).GUID, typeof(BuildPage).GUID, - typeof(DebugOptionsPropertyPage).GUID, - typeof(VMOptionsPropertyPage).GUID, + typeof(DebugPage).GUID, + typeof(VMPage).GUID, }; } finally