From: Chris M. <cm...@us...> - 2006-07-30 05:33:28
|
User: cmicali Date: 06/07/29 22:33:27 Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn AddInSettings.cs etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven Maven2Proxy.cs etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages AboutOptionsPage.cs AboutOptionsPage.designer.cs AboutOptionsPage.resx ExternalToolsOptionsPage.cs ExternalToolsOptionsPage.designer.cs ExternalToolsOptionsPage.resx etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda pom.xml etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml empty.model.xml etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources pom.xml settings.xml etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards MDASolutionWizard.cs WelcomeWizard.Designer.cs WelcomeWizard.cs WelcomeWizard.resx Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroidVS-1.4-beta4-Setup.exe Removed: etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroidVS-1.4-beta3-Setup.exe Log: - Fixed version error in models output by the solution wizard - Cleaned up the maven build scripts output by the solution wizard - Updated maven 2 proxy to show maven download status in the status bar - Fixed potential crash in VSExternalToolProxy - Changed add in settings prefix so new installs will have their settings reset Revision Changes Path 1.13 +78 -58 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AddInSettings.cs Index: AddInSettings.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AddInSettings.cs,v retrieving revision 1.12 retrieving revision 1.13 diff -u -w -r1.12 -r1.13 --- AddInSettings.cs 25 Jul 2006 13:09:28 -0000 1.12 +++ AddInSettings.cs 30 Jul 2006 05:33:25 -0000 1.13 @@ -12,6 +12,7 @@ using EnvDTE; using EnvDTE80; +using System.Collections; #endregion @@ -22,6 +23,8 @@ public class AddInSettings { + public const string SETTING_NAME_PREFIX = "ARDV"; + public const int ADDIN_SETTINGS_VERSION = 9; #region Member variables @@ -51,11 +54,10 @@ PassSchemaExportArguments = true; SchemaExportCommandLine = "-o -e"; } - else if (AddInBuild < 8) + if (AddInBuild < ADDIN_SETTINGS_VERSION) { - SchemaExportCommandLine = "-o -e"; + AddInBuild = ADDIN_SETTINGS_VERSION; } - } #endregion @@ -64,33 +66,33 @@ public bool FirstRun { - get { return m_settings.GetBool("AMDAFirstRun", true); } - set { m_settings.SetBool("AMDAFirstRun", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "FirstRun", true); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "FirstRun", value); } } public bool ShowWelcomeWizard { - get { return m_settings.GetBool("AMDAShowWiz", true); } - set { m_settings.SetBool("AMDAShowWiz", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "ShowWiz", true); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "ShowWiz", value); } } public bool PromptToGenerateOnBuildIfFilesOutOfDate { - get { return m_settings.GetBool("AMDABdPrmptO", true); } - set { m_settings.SetBool("AMDABdPrmptO", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "BdPrmptO", true); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "BdPrmptO", value); } } public bool PromptToGenerateOnBuildIfSolutionNotSynched { - get { return m_settings.GetBool("AMDABdPrmptS", false); } - set { m_settings.SetBool("AMDABdPrmptS", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "BdPrmptS", false); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "BdPrmptS", value); } } public int AddInBuild { get { - int? build = m_settings.GetInt("AMDABuild"); + int? build = m_settings.GetInt(SETTING_NAME_PREFIX + "Build"); if (build.HasValue) { return build.Value; @@ -100,7 +102,7 @@ return -1; } } - set { m_settings.SetInt("AMDABuild", value); } + set { m_settings.SetInt(SETTING_NAME_PREFIX + "Build", value); } } #endregion @@ -109,20 +111,20 @@ public string ResyncIgnoreList { - get { return m_settings["AMDAIgnoreLst"]; } - set { m_settings["AMDAIgnoreLst"] = value; } + get { return m_settings[SETTING_NAME_PREFIX + "IgnoreLst"]; } + set { m_settings[SETTING_NAME_PREFIX + "IgnoreLst"] = value; } } public bool ResyncIgnoreHiddenFiles { - get { return m_settings.GetBool("AMDARIHdnFl", false); } - set { m_settings.SetBool("AMDARIHdnFl", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "RIHdnFl", false); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "RIHdnFl", value); } } public bool ShowResyncButton { - get { return m_settings.GetBool("AMDARShBtn", false); } - set { m_settings.SetBool("AMDARShBtn", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "RShBtn", false); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "RShBtn", value); } } #endregion @@ -131,26 +133,26 @@ public string UMLModellerPath { - get { return m_settings["AMDAMgcDrawPth"]; } - set { m_settings["AMDAMgcDrawPth"] = value; } + get { return m_settings[SETTING_NAME_PREFIX + "MgcDrawPth"]; } + set { m_settings[SETTING_NAME_PREFIX + "MgcDrawPth"] = value; } } public string SchemaExportCommandLine { - get { return m_settings["AMDAScExCmdLn"]; } - set { m_settings["AMDAScExCmdLn"] = value; } + get { return m_settings[SETTING_NAME_PREFIX + "ScExCmdLn"]; } + set { m_settings[SETTING_NAME_PREFIX + "ScExCmdLn"] = value; } } public bool PassSchemaExportArguments { - get { return m_settings.GetBool("AMDAScExPass", true); } - set { m_settings.SetBool("AMDAScExPass", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "ScExPass", true); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "ScExPass", value); } } public bool AutoMakeModelFileWritable { - get { return m_settings.GetBool("AMDAMdlWritbl", false); } - set { m_settings.SetBool("AMDAMdlWritbl", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "MdlWritbl", false); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "MdlWritbl", value); } } #endregion @@ -159,26 +161,26 @@ public bool MavenUseOfflineMode { - get { return m_settings.GetBool("AMDAMavenOffln"); } - set { m_settings.SetBool("AMDAMavenOffln", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "MavenOffln"); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "MavenOffln", value); } } public bool MavenCleanFirst { - get { return m_settings.GetBool("AMDAMavenClean"); } - set { m_settings.SetBool("AMDAMavenClean", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "MavenClean"); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "MavenClean", value); } } public bool MavenUseCustomCommandLine { - get { return m_settings.GetBool("AMDAMavenUseCC"); } - set { m_settings.SetBool("AMDAMavenUseCC", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "MavenUseCC"); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "MavenUseCC", value); } } public string MavenCustomCommandLine { - get { return m_settings["AMDAMavenCCLN"]; } - set { m_settings["AMDAMavenCCLN"] = value; } + get { return m_settings[SETTING_NAME_PREFIX + "MavenCCLN"]; } + set { m_settings[SETTING_NAME_PREFIX + "MavenCCLN"] = value; } } #endregion @@ -187,15 +189,15 @@ public bool ToolBarVisible { - get { return m_settings.GetBool("AMDATBVisible", true); } - set { m_settings.SetBool("AMDATBVisible", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "TBVisible", true); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "TBVisible", value); } } public MsoBarPosition ToolBarPosition { get { - string pos = m_settings["AMDATBPos"]; + string pos = m_settings[SETTING_NAME_PREFIX + "TBPos"]; if (pos == string.Empty) { return MsoBarPosition.msoBarTop; @@ -207,26 +209,26 @@ } set { - m_settings["AMDATBPos"] = value.ToString(); + m_settings[SETTING_NAME_PREFIX + "TBPos"] = value.ToString(); } } public int? ToolBarTop { - get { return m_settings.GetInt("AMDATBTop"); } - set { m_settings.SetInt("AMDATBTop", value); } + get { return m_settings.GetInt(SETTING_NAME_PREFIX + "TBTop"); } + set { m_settings.SetInt(SETTING_NAME_PREFIX + "TBTop", value); } } public int? ToolBarLeft { - get { return m_settings.GetInt("AMDATBLeft"); } - set { m_settings.SetInt("AMDATBLeft", value); } + get { return m_settings.GetInt(SETTING_NAME_PREFIX + "TBLeft"); } + set { m_settings.SetInt(SETTING_NAME_PREFIX + "TBLeft", value); } } public int? ToolBarRowIndex { - get { return m_settings.GetInt("AMDATBRowIdx"); } - set { m_settings.SetInt("AMDATBRowIdx", value); } + get { return m_settings.GetInt(SETTING_NAME_PREFIX + "TBRowIdx"); } + set { m_settings.SetInt(SETTING_NAME_PREFIX + "TBRowIdx", value); } } #endregion @@ -263,26 +265,26 @@ public bool ShowPropertyMapper { - get { return m_settings.GetBool("AMDAPrpMapE", true); } - set { m_settings.SetBool("AMDAPrpMapE", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "PrpMapE", true); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "PrpMapE", value); } } public bool ShowInsertEntityConversion { - get { return m_settings.GetBool("AMDAEntConS", true); } - set { m_settings.SetBool("AMDAEntConS", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "EntConS", true); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "EntConS", value); } } public bool OnlyEnableCodeGenOnConversionMethods { - get { return m_settings.GetBool("AMDACdeGenE", true); } - set { m_settings.SetBool("AMDACdeGenE", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "CdeGenE", true); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "CdeGenE", value); } } public bool OnlyEnableCodeGenInDaoImpl { - get { return m_settings.GetBool("AMDACdeGenD", true); } - set { m_settings.SetBool("AMDACdeGenD", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "CdeGenD", true); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "CdeGenD", value); } } #endregion @@ -291,13 +293,31 @@ public bool PropertyMapperAutoMapOnOpen { - get { return m_settings.GetBool("AMDAPMAMOO", false); } - set { m_settings.SetBool("AMDAPMAMOO", value); } + get { return m_settings.GetBool(SETTING_NAME_PREFIX + "PMAMOO", false); } + set { m_settings.SetBool(SETTING_NAME_PREFIX + "PMAMOO", value); } } #endregion - #region Helper methods + #region Methods + + public void EraseAllSettings() + { + EraseAllSettings(SETTING_NAME_PREFIX); + } + + public void EraseAllSettings(string prefix) + { + IList variables = (IList)m_applicationObject.Globals.VariableNames; + foreach (string varname in variables) + { + if (varname.StartsWith(prefix)) + { + m_applicationObject.Globals[varname] = string.Empty; + m_applicationObject.Globals.set_VariablePersists(varname, false); + } + } + } public bool IsInIgnoreList(string fileToTest) { 1.2 +19 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/Maven2Proxy.cs Index: Maven2Proxy.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/Maven2Proxy.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- Maven2Proxy.cs 25 Jul 2006 13:09:33 -0000 1.1 +++ Maven2Proxy.cs 30 Jul 2006 05:33:25 -0000 1.2 @@ -39,10 +39,28 @@ private void ProcessOutput(ref string text, ref bool cancelOutput) { if (text == string.Empty) return; - if (text.Contains("does not exist or no valid version could be found") || text.Contains("required artifacts are missing") || text.Contains("required artifact is missing")) + if (text.Contains("does not exist or no valid version could be found") || text.Contains("required artifacts are missing") || text.Contains("required artifact is missing") || text.Contains("Failed to resolve artifact")) { m_mavenStatus = MavenStatus.UnsatisfiedDependency; } + else + { + if (text.EndsWith("K")) + { + string[] t = text.Split('/'); + if (t.Length == 2) + { + int current = int.Parse(t[0]); + int total = int.Parse(t[1].Remove(t[1].Length - 1)); + OutputWindow.DTE.StatusBar.Progress(true, "AndroMDA: Maven: Downloading file... " + text, current, total); + cancelOutput = true; + } + } + else if (text.EndsWith("K downloaded")) + { + OutputWindow.DTE.StatusBar.Progress(false, "Android/VS: Generation Progress",0,0); + } + } } public override void BeforeStart() 1.3 +1 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.cs Index: AboutOptionsPage.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- AboutOptionsPage.cs 25 Jul 2006 13:09:30 -0000 1.2 +++ AboutOptionsPage.cs 30 Jul 2006 05:33:25 -0000 1.3 @@ -154,6 +154,7 @@ Kapil Viren Ahuja\par Manish Agrawal\par Vaneet Kaur\par +Karthick Pachiappan\par \b\par }"; 1.3 +3 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.designer.cs Index: AboutOptionsPage.designer.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.designer.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- AboutOptionsPage.designer.cs 25 Jul 2006 13:09:30 -0000 1.2 +++ AboutOptionsPage.designer.cs 30 Jul 2006 05:33:25 -0000 1.3 @@ -87,13 +87,13 @@ // this.lblVersion.BackColor = System.Drawing.Color.Black; this.lblVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblVersion.ForeColor = System.Drawing.Color.LightGray; - this.lblVersion.Location = new System.Drawing.Point(113, 71); + this.lblVersion.ForeColor = System.Drawing.Color.Gray; + this.lblVersion.Location = new System.Drawing.Point(300, 68); this.lblVersion.Name = "lblVersion"; this.lblVersion.Size = new System.Drawing.Size(73, 13); this.lblVersion.TabIndex = 0; this.lblVersion.Text = "version"; - this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // tabControl1 // 1.3 +71 -71 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.resx Index: AboutOptionsPage.resx =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.resx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- AboutOptionsPage.resx 25 Jul 2006 13:09:30 -0000 1.2 +++ AboutOptionsPage.resx 30 Jul 2006 05:33:25 -0000 1.3 @@ -380,82 +380,82 @@ <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACC + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB4 EQAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABEAMAAQEBAAEgBgABEBoAAYECHwH/AXwCHwH/AXwCHwH/AXwCHwH/AXwCHwH/AXwCHwH/AXwCHwH/ - AXwCHwH/AXwCHwH/AXwCHwH/AXwCHwH/AX0CHwH/AbcCHwH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC + AwABEAMAAQEBAAEgBgABEBoAAYECIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/ + AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX8CIQH/AbcCIQH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC AZkBVgICAa0BVQICAa4BUgICAaIBRAIBAXcBJwIBATgBDAIBAQ4BAgMBDAABBwIBAQgBTwICAZkBZAIF AeQBWwICAb0BSwICAYwBPAIBAWQBJQIBATUBHAIBASYBRQIBAXsBVgICAa8BUgICAaUBQwIBAXMBGgIB ASIBAgMBTAAB7AHaAdMC/wHoAdYC/wHmAdIC/wHlAc4C/wHiAcoC/wHhAcYC/wHgAcMC/wHdAb8C/wHc - AbsC/wHaAbgC/wHZAbMB/wGLAXUBcQH/AbMCHwH/DAABCgIBAQwBMwIBAU8BnQFrAWcB/AH0AegB4wH/ + AbsC/wHaAbgC/wHZAbMB/wGLAXcBcwH/AbMCIQH/DAABCgIBAQwBMwIBAU8BmQFnAWMB/AH0AegB4wH/ AvQB8wH/AfAB8gHzAf8B8QHyAfMB/wH0Ae0B6QH/Ae4B2wHQAf8BYgIDAdQBQQIBAXABFAIBARkBAgMB - CAABXgIDAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0AQsBCgHzAbYCQwH9Af8CxgL/AtoC/wLp - Af8ByAKpAf8BVwICAbYBKQIBATwBAgMBSAAB4gHZAdIC/wHqAdUC/wHoAc8C/wHlAcoC/wHiAcQC/wHe - Ab8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAXMBdwH/AbMCHwH/CAABCQIBAQoBRQIB - AXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAYEB/wHCAYEBcQH/AcwBjwGBAf8B3wHOAcQB/wHt - AfAB8gH/AfYC9AH/AX8BKQEoAfgBRgIBAX0BEgIBARYBAgMBBAADtwH/AcECwgL/AfYB7gH/AVgBrAFR - Af8BsAHZAaUB/wHvAcYBjQH/AccCgQL/AqEC/wKyAv8CxAL/AtQC/wL+Af8B8QLqAf8BVwICAbEBGAIB - AR9IAAHkAd0B1gL/Ae0B2wL/AeoB1gL/AegB0QL/AeoBxwH/AcEBugHSAv8B5wG+Av8B3gG7Av8B2wG2 - Av8B2AGxAv8B1wGpAf8BiwF1AXgB/wGzAh8B/wgAATACAQFKAfcB8QHtAf8B8AH0AfUB/wHIAYEBfAH/ - Ab8BegFJAf8BwgGBAVcB/wHsAe4B7wH/AdIBiAGBAf8BwAF9AUwB/wG9AX8BUQH/AeoB6QHoAf8B9QH2 - AfcB/wF2AgkB8QE7AgEBYAEIAgEBCQQAA78B/wLZAdoC/wHuAd8B/wEmAbABNwH/AS8BrQE6Af8BXQGB - AUgC/wK1Av8CngL/AqAC/wGxAbAC/wHFAcMJ/wGiAn8B/gFAAgEBbUgAAeYB4AHbAv8B8wHmAv8B8wHm - Av8B7gG+Af8BQwFfAe8B/wEfAVIC/wF/AYEB4AL/Ad4BvQL/Ad4BvQL/Ad4BvQL/Ad4BvQH/AY4BeAF5 - Af8BswIfAf8IAAHxAd4B0wH/AfQC9gH/AcQBgQFiAf8BxQGBAVEB/wHLAYEBUgH/AcABgQFmAf8B/gP/ - AdkBqAGPAf8BygGBAVIB/wHHAYEBUAH/AbwBdwFFAf8B7gHvAfAB/wH2Ae4B6gH/AVgCAgG6ARwCAQEl - BAADywH/AdsC3AL/AeYBzgH/AUMBzAFjAf8BPAG+AVAB/wGmAYgBgQL/AsMC/wKwAv8B0QHZAf8B+AGx - AcwC/wHnBv8B/QH8Af0B/wH8AvsB/wFTAgIBpEgAAekB4wHfAv8B5gHJAf8BkAGPAckB/wEfAUcC/wEf - AUgC/wEwAV8C/wEfAUkC/wH5AdwBrAL/Ad4BvQL/Ad4BvQL/AdwBtAH/AY4BeQF6Af8BswIfAf8EAAEx - AgEBSwH5AfoB+QH/AeEBwQGxAf8BxgGBAVEB/wHMAYEBVAH/AcwBgQFTAf8BzAGBAVEB/wHKAX8BSgH/ - AcsBgQFOAf8BzAGBAVIB/wHLAYEBUwH/AccBgQFRAf8BxgGBAWwB/wHzAvUB/wGYAWYBYQH8ATQCAQFS - BAADzwH/Ad8B4AHiAv8B3QG8Af8BYQHqAYEB/wFOAdMBawH/AcsBnAGfAv8CzQL/AsMC/wH0AfwB/wGi - AswB/wGtAYIBgQH/AfcB8wHyAf8B6wHiAd8B/wHwAekB5QH/AVoCAwHCSAAB6wHmAeMC/wHlAckB/wF0 - AYEB8wH/AUMBaQL/AfwB5AG5Av8B6QGyAf8BHwFGAv8BOwFeAfMC/wHcAawC/wHVAawC/wHeAbkB/wGP - AXoBfAH/AbMCHwH/BAABagIFAeEB+gH9Af4B/wHGAYEBVQH/Ac0BgQFVAf8BzQGBAVQB/wHMAYEBUgH/ - AccBgQFWBf8B2gGRAYEB/wHMAYEBUgH/AcwBgQFTAf8BywGBAVMB/wHBAXsBRwH/A/EB/wHyAd8B1QH/ - AUQCAQF3BAAD0gH/AeMB5gHoAv8B1wGqAf8BXAHCAeAB/wFoAbMC/wGdAYEBjgL/AsoC/wLWAv8B9QL/ - AcsBoQGeAf8B3QGUAZgC/wHFAcYC/wKyAv8CygH/AVsCAgG9SAAB7QHqAecC/wHnAc4C/wHkAcIC/wHj - Ab4C/wHeAb0C/wHcAboB/wKlAdkB/wEfAU8C/wHGAbMBvAL/AdcBrwL/AeEBvgH/AZMBfAF+Af8BswIf - Af8EAAG5AZUBjgL+A/8BygGBAVEB/wHQAYEBVwH/AcwBgQFSAf8BzAGBAVIB/wHMAYEBTgH/AeQB6gHs - Af8B+gHxAewB/wHKAX8BSwH/AcwBgQFSAf8BzQGBAVQB/wHIAYEBUQH/AesB2wHTAf8B9QHpAeMB/wFI - AgIBggQAAdcB0wHLAf8B8gG4AYEC/wHPAZwB/wGwAbsBxQH/AYEBtgHjAf8BYAFxAaMO/wHLAegC/wHJ - AdgC/wKcAv8CoAH/Af0CsgH/AUMCAQF1SAAB7wHtAesC/wHoAdEC/wHhAcMC/wHgAcAC/wHfAb4C/wHd - AbsC/wHlAbUB/wEqAVQC/wEfAUYD/wHeAb0C/wHkAcQB/wGUAX4BgAH/AbMCHwH/BAAB8AHcAdEF/wHS - AYEBWAH/AdMBgQFaAf8BzAGBAVIB/wHMAYEBUgH/AcwBgQFSAf8BxQGBAVgB/wH2AfkB+wH/AfsB8QHt - Af8BywGBAUwB/wHPAYEBVgH/AcwBgQFVAf8B7gHbAdIB/wH3AewB5QH/AUYCAQF8BAAB2wHBAZ0B/wHi - AagBfgL/AccBigL/AckBjwL/AckBjgL/AckBkAH/Ab4BoAGkBv8C/gL/As8C/wLDAv8CsQL/Ap4B/wG5 - AkAB/QEVAgEBG0gAAfIC8QL/AecB0QL/AeABwAL/Ad8BvwL/Ad0BvAL/AdwBugL/AdsBuAH/Ae0B1gG/ - Af8BHwFMAv8BfwGBAdsC/wHmAckB/wGYAYABgQH/AbMCHwH/BAABcgIbAfUE/wHfAYEBZQH/AdsBgQFj - Af8BzgGBAVQB/wHLAYABSwH/AcsBgQFPAf8BzAGBAVIB/wHEAYEBawX/AdwBlAGBAf8B0gGBAVoB/wHP - AYEBVQH/AfsB9QHzAf8B9QHkAdwB/wE6AgEBXwQAAdsBxwGyAf8D2QL/AboBgAL/AbsBgQL/AbwBgQL/ - Ab0BgQH/AfkBugGBAf8BxQGrAa0C/wL3Av8C4QL/AtAC/wLGAf8B0gKPAf8BHwIBASoBAgMBSAAB9ALz - Av8B4gHGAv8B1wGxAv8B1wGwAv8B1gGvAv8B1gGtAv8B1gGsAv8B1wGpAf8BZQGBAfMB/wH8Ad0BpQL/ - AekBzwH/AZoBgAGBAf8BswIfAf8EAAFIAgIBgAT/AfsByQGuAf8B7gGKAXYB/wHSAYEBZwH/AfEB9gH5 - Af8B6wHCAa4B/wHLAYEBTgH/AcoBgQFiBf8B3wGlAYkB/wHcAYEBZAH/AdgBgQFjBf8BuAGTAYwB/gEj - AgEBMQQAA9EB/wHHAcoBzQH/Af4BrQFVAf8B8wHxAe8B/wHyAdYBqgH/AfQBvwGBAf8B+gGuAV0C/wGo - AT4B/wHIAYEBWQH/Ab4BkQGFAf8BsgJTAf0BWwICAbgBFAIBARlQAAL2AfUC/wHhAcIC/wHWAawC/wHV - AasC/wHVAasC/wHUAakC/wHUAakC/wHTAagC/wHVAaYC/wHRAaQC/wHtAdYB/wGcAX4BfwH/AbMCHwH/ - CAAB9gHoAeAG/wGjAYEB/wH6AZUBgAH/Ac0BxgHDBf8B/AH1AfEF/wH2AfsB/QH/AeYBgwFxAf8B6wGD - AW4B/wH9AfUB7gH/Af4C/AH/AU0CAgGTAQwCAQEOBAAD6AH/AeoC6wH/Ac0BtAG1Af8B5wLcAf8B9QL3 - Af8B7wLxAf8B6gHsAe0B/wHhAeQB5gH/AdsB3wHlAf8B1gHYAdoB/wGoAYoBgwH+AWsCBgHpARcCAQEd - UAAC+AH1Cv8B/gP/AfsB+QL/AfkB9AL/AfYB7wL/AfQB6gL/AfMB5gH/AfsB8AHjAv8B8QHXAf8BnwF6 - AXsB/wGwAh8B/wgAAUoCAgGGCf8B0AGcAv8BuwGHAf8B6QG/AaoB/wHXAccBwAH/Ad8ByQG/Af8B/AGp - AYEC/wGkAYEC/wHoAdcF/wGdAWsBZwH8AR4CAQEoAQMCAQECAQQCAQEEAd8C3gH/Ad0BywG8Af8BtgKB - Af8BqwKBAf8BsAKBAf8BswKBAf8BuwGEAYUB/wHKAp8B/wHqAuwB/wHpAuoB/wF/AiwB+AEnAgEBOFQA - AfoB+QH3Dv8C/gL/AfsB+AL/AfkB9AL/AfYB7gH/Ae4B3wHaAf8B8QGYAUEB/wHeAYEBKwH/AboBiQGB - Af8BygIfAf8IAAECAwEBYAIDAdMK/wHtAv8B+wHRAv8B7wG7Av8B5AGxAv8B6wHNCf8BugGWAY8B/gEj - AgEBMQEEAgEBBAQAATwCAQFkAfUB+QH+Af8B/QHDAYEC/wHMAZcC/wHNAZ8C/wHPAakC/wHRAbEB/wH9 - AcoBtgH/AfMBwQG3Av8C2wL/AuQB/wHvAugB/wFGAgEBfAEDAgEBA1AAAf0B+gH4Ev8C/gL/AfwB+QL/ - AfkB9AH/Ae8B4QHcAv8BzwGBAf8BugGJAYEB/wHKAh8B/xAAAQIDAQFGAgEBewH1AeYB3hX/AfoB8QHs - Af8BawIGAekBGAIBAR8BAwIBAQMIAAFLAgIBiwH+AbcBegH/Af4BywGWAv8BzAGfAv8BzgGoAv8BzgGw - Av8BzgG4Av8BzQHAAf8BvAGLAYgB/gFsAgcB6wH/Av0F/wFMAgIBjgEIAgEBCVAAAfcB0gGvAf8B8gHL - AasB/wHqAcQBpwH/AeEBuwGiAf8B2QGzAZ0B/wHQAaoBmAH/AcoBpAGUAf8ByAGiAZMB/wHIAaIBkwH/ - AboBiQGBAf8BygIfAf8gAAFAAgEBbQFxAgcB7AG6AZYBjgH+AY0BQgFAAfoBUgICAZ4gAAECAwEBAgMB - ARQCAQEaASgCAQE5ATcCAQFYAUoCAgGFAU4CAgGPARQCAQEaAS0CAQFEAQoCAQEMAQIDAUwAAUIBTQE+ - BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAHAAQEB4AEDAYABAQIAAcABAQHAAQEBgAMA - AcABAQGAAQABgAMAAcABAQGAAQABgAMAAcABAQGAAQABgAMAAcABAQIAAYADAAHAAQECAAGAAwABwAEB - AgABgAMAAcABAQIAAYADAAHAAQECAAGAAwABwAEBAgABgAEDAgABwAEBAYABAAGAAQMCAAHAAQEBgAIA - AQcCAAHAAQEBgAEBAQABAwIAAcABAwHAAQMBAAEDAgABwAEHAfgBPwHAAQcCAAs= + CAABXgIDAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0AgoB8wG2Aj8B/QH/AsYC/wLaAv8C6QH/ + AcgCqQH/AVcCAgG2ASkCAQE8AQIDAUgAAeIB2QHSAv8B6gHVAv8B6AHPAv8B5QHKAv8B4gHEAv8B3gG/ + Av8B3QG6Av8B2gG1Av8B2AGxAv8B1gGrAv8B1AGjAf8BiQF1AXkB/wGzAiEB/wgAAQkCAQEKAUUCAQF5 + AfUB6wHlAf8B8AHxAfIB/wHkAd0B2wH/Ab4BiwGBAf8BwgGBAXMB/wHMAY8BgQH/Ad8BzgHEAf8B7QHw + AfIB/wH2AvQB/wF/AScBJgH4AUYCAQF9ARICAQEWAQIDAQQAA7cB/wHBAsIC/wH2Ae4B/wFaAawBUwH/ + AbAB2QGlAf8B7wHGAY0B/wHHAoEC/wKhAv8CsgL/AsQC/wLUAv8C/gH/AfEC6gH/AVcCAgGxARgCAQEf + SAAB5AHdAdYC/wHtAdsC/wHqAdYC/wHoAdEC/wHqAccB/wHBAboB0gL/AecBvgL/Ad4BuwL/AdsBtgL/ + AdgBsQL/AdcBqQH/AYsBdwF6Af8BswIhAf8IAAEwAgEBSgH3AfEB7QH/AfAB9AH1Af8ByAGBAX4B/wG/ + AXwBSwH/AcIBgQFZAf8B7AHuAe8B/wHSAYgBgQH/AcABfwFOAf8BvQGBAVMB/wHqAekB6AH/AfUB9gH3 + Af8BdgIJAfEBOwIBAWABCAIBAQkEAAO/Af8C2QHaAv8B7gHfAf8BKAGwATkB/wExAa0BPAH/AV8BgQFK + Av8CtQL/Ap4C/wKgAv8BsQGwAv8BxQHDCf8BoAJ/Af4BQAIBAW1IAAHmAeAB2wL/AfMB5gL/AfMB5gL/ + Ae4BvgH/AUUBYQHvAf8BIQFUAv8CgQHgAv8B3gG9Av8B3gG9Av8B3gG9Av8B3gG9Af8BjgF6AXsB/wGz + AiEB/wgAAfEB3gHTAf8B9AL2Af8BxAGBAWQB/wHFAYEBUwH/AcsBgQFUAf8BwAGBAWgB/wH+A/8B2QGo + AY8B/wHKAYEBVAH/AccBgQFSAf8BvAF5AUcB/wHuAe8B8AH/AfYB7gHqAf8BWAICAboBHAIBASUEAAPL + Af8B2wLcAv8B5gHOAf8BRQHMAWUB/wE+Ab4BUgH/AaYBiAGBAv8CwwL/ArAC/wHRAdkB/wH4AbEBzAL/ + AecG/wH9AfwB/QH/AfwC+wH/AVMCAgGkSAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/ASEBSQL/ASEBSgL/ + ATIBYQL/ASEBSwL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgF7AXwB/wGzAiEB/wQAATECAQFL + AfkB+gH5Af8B4QHBAbEB/wHGAYEBUwH/AcwBgQFWAf8BzAGBAVUB/wHMAYEBUwH/AcoBgQFMAf8BywGB + AVAB/wHMAYEBVAH/AcsBgQFVAf8BxwGBAVMB/wHGAYEBbgH/AfMC9QH/AZQBYgFfAfwBNAIBAVIEAAPP + Af8B3wHgAeIC/wHdAbwB/wFjAeoBgQH/AVAB0wFtAf8BywGcAZ8C/wLNAv8CwwL/AfQB/AH/AaICzAH/ + Aa0BggGBAf8B9wHzAfIB/wHrAeIB3wH/AfAB6QHlAf8BWgIDAcJIAAHrAeYB4wL/AeUByQH/AXYBgQHz + Af8BRQFrAv8B/AHkAbkC/wHpAbIB/wEhAUgC/wE9AWAB8wL/AdwBrAL/AdUBrAL/Ad4BuQH/AY8BfAF+ + Af8BswIhAf8EAAFqAgUB4QH6Af0B/gH/AcYBgQFXAf8BzQGBAVcB/wHNAYEBVgH/AcwBgQFUAf8BxwGB + AVgF/wHaAZEBgQH/AcwBgQFUAf8BzAGBAVUB/wHLAYEBVQH/AcEBfQFJAf8D8QH/AfIB3wHVAf8BRAIB + AXcEAAPSAf8B4wHmAegC/wHXAaoB/wFeAcIB4AH/AWoBswL/AZ0BgQGOAv8CygL/AtYC/wH1Av8BywGh + AZ4B/wHdAZQBmAL/AcUBxgL/ArIC/wLKAf8BWwICAb1IAAHtAeoB5wL/AecBzgL/AeQBwgL/AeMBvgL/ + Ad4BvQL/AdwBugH/AqUB2QH/ASEBUQL/AcYBswG8Av8B1wGvAv8B4QG+Af8BkwF+AYAB/wGzAiEB/wQA + AbcBkQGKAv4D/wHKAYEBUwH/AdABgQFZAf8BzAGBAVQB/wHMAYEBVAH/AcwBgQFQAf8B5AHqAewB/wH6 + AfEB7AH/AcoBgQFNAf8BzAGBAVQB/wHNAYEBVgH/AcgBgQFTAf8B6wHbAdMB/wH1AekB4wH/AUgCAgGC + BAAB1wHTAcsB/wHyAbgBgQL/Ac8BnAH/AbABuwHFAf8BgQG2AeMB/wFiAXMBow7/AcsB6AL/AckB2AL/ + ApwC/wKgAf8B/QKyAf8BQwIBAXVIAAHvAe0B6wL/AegB0QL/AeEBwwL/AeABwAL/Ad8BvgL/Ad0BuwL/ + AeUBtQH/ASwBVgL/ASEBSAP/Ad4BvQL/AeQBxAH/AZQBgAGBAf8BswIhAf8EAAHwAdwB0QX/AdIBgQFa + Af8B0wGBAVwB/wHMAYEBVAH/AcwBgQFUAf8BzAGBAVQB/wHFAYEBWgH/AfYB+QH7Af8B+wHxAe0B/wHL + AYEBTgH/Ac8BgQFYAf8BzAGBAVcB/wHuAdsB0gH/AfcB7AHlAf8BRgIBAXwEAAHbAcEBnQH/AeIBqAGA + Av8BxwGKAv8ByQGPAv8ByQGOAv8ByQGQAf8BvgGgAaQG/wL+Av8CzwL/AsMC/wKxAv8CngH/AbkCPwH9 + ARUCAQEbSAAB8gLxAv8B5wHRAv8B4AHAAv8B3wG/Av8B3QG8Av8B3AG6Av8B2wG4Af8B7QHWAb8B/wEh + AU4C/wKBAdsC/wHmAckB/wGYAoEB/wGzAiEB/wQAAXICGQH1BP8B3wGBAWcB/wHbAYEBZQH/Ac4BgQFW + Af8BywGBAU0B/wHLAYEBUQH/AcwBgQFUAf8BxAGBAW0F/wHcAZQBgQH/AdIBgQFcAf8BzwGBAVcB/wH7 + AfUB8wH/AfUB5AHcAf8BOgIBAV8EAAHbAccBsgH/A9kC/wG6AYEC/wG7AYEC/wG8AYEC/wG9AYEB/wH5 + AboBgQH/AcUBqwGtAv8C9wL/AuEC/wLQAv8CxgH/AdICjwH/AR8CAQEqAQIDAUgAAfQC8wL/AeIBxgL/ + AdcBsQL/AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AWcBgQHzAf8B/AHdAaUC/wHpAc8B/wGa + AoEB/wGzAiEB/wQAAUgCAgGABP8B+wHJAa4B/wHuAYoBeAH/AdIBgQFpAf8B8QH2AfkB/wHrAcIBrgH/ + AcsBgQFQAf8BygGBAWQF/wHfAaUBiQH/AdwBgQFmAf8B2AGBAWUF/wG2AY8BiAH+ASMCAQExBAAD0QH/ + AccBygHNAf8B/gGtAVcB/wHzAfEB7wH/AfIB1gGqAf8B9AG/AYEB/wH6Aa4BXwL/AagBQAH/AcgBgQFb + Af8BvgGRAYUB/wGyAk8B/QFbAgIBuAEUAgEBGVAAAvYB9QL/AeEBwgL/AdYBrAL/AdUBqwL/AdUBqwL/ + AdQBqQL/AdQBqQL/AdMBqAL/AdUBpgL/AdEBpAL/Ae0B1gH/AZwBgAGBAf8BswIhAf8IAAH2AegB4Ab/ + AaMBgQH/AfoBlQGBAf8BzQHGAcMF/wH8AfUB8QX/AfYB+wH9Af8B5gGDAXMB/wHrAYMBcAH/Af0B9QHu + Af8B/gL8Af8BTQICAZMBDAIBAQ4EAAPoAf8B6gLrAf8BzQG0AbUB/wHnAtwB/wH1AvcB/wHvAvEB/wHq + AewB7QH/AeEB5AHmAf8B2wHfAeUB/wHWAdgB2gH/AaYBhgF/Af4BawIGAekBFwIBAR1QAAL4AfUK/wH+ + A/8B+wH5Av8B+QH0Av8B9gHvAv8B9AHqAv8B8wHmAf8B+wHwAeMC/wHxAdcB/wGfAXwBfQH/AbACIQH/ + CAABSgICAYYJ/wHQAZwC/wG7AYcB/wHpAb8BqgH/AdcBxwHAAf8B3wHJAb8B/wH8AakBgQL/AaQBgQL/ + AegB1wX/AZkBZwFjAfwBHgIBASgBAwIBAQIBBAIBAQQB3wLeAf8B3QHLAbwB/wG2AoEB/wGrAoEB/wGw + AoEB/wGzAoEB/wG7AYQBhQH/AcoCnwH/AeoC7AH/AekC6gH/AX8CKgH4AScCAQE4VAAB+gH5AfcO/wL+ + Av8B+wH4Av8B+QH0Av8B9gHuAf8B7gHfAdoB/wHxAZgBQwH/Ad4BgQEtAf8BugGJAYEB/wHKAiEB/wgA + AQIDAQFgAgMB0wr/Ae0C/wH7AdEC/wHvAbsC/wHkAbEC/wHrAc0J/wG4AZIBiwH+ASMCAQExAQQCAQEE + BAABPAIBAWQB9QH5Af4B/wH9AcMBgQL/AcwBlwL/Ac0BnwL/Ac8BqQL/AdEBsQH/Af0BygG2Af8B8wHB + AbcC/wLbAv8C5AH/Ae8C6AH/AUYCAQF8AQMCAQEDUAAB/QH6AfgS/wL+Av8B/AH5Av8B+QH0Af8B7wHh + AdwC/wHPAYEB/wG6AYkBgQH/AcoCIQH/EAABAgMBAUYCAQF7AfUB5gHeFf8B+gHxAewB/wFrAgYB6QEY + AgEBHwEDAgEBAwgAAUsCAgGLAf4BtwF8Af8B/gHLAZYC/wHMAZ8C/wHOAagC/wHOAbAC/wHOAbgC/wHN + AcAB/wG6AYcBhAH+AWwCBwHrAf8C/QX/AUwCAgGOAQgCAQEJUAAB9wHSAa8B/wHyAcsBqwH/AeoBxAGn + Af8B4QG7AaIB/wHZAbMBnQH/AdABqgGYAf8BygGkAZQB/wHIAaIBkwH/AcgBogGTAf8BugGJAYEB/wHK + AiEB/yAAAUACAQFtAXECBwHsAbgBkgGKAf4BiQE/AT4B+gFSAgIBniAAAQIDAQECAwEBFAIBARoBKAIB + ATkBNwIBAVgBSgICAYUBTgICAY8BFAIBARoBLQIBAUQBCgIBAQwBAgMBTAABQgFNAT4HAAE+AwABKAMA + AUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAcABAQHgAQMBgAEBAgABwAEBAcABAQGAAwABwAEBAYABAAGA + AwABwAEBAYABAAGAAwABwAEBAYABAAGAAwABwAEBAgABgAMAAcABAQIAAYADAAHAAQECAAGAAwABwAEB + AgABgAMAAcABAQIAAYADAAHAAQECAAGAAQMCAAHAAQEBgAEAAYABAwIAAcABAQGAAgABBwIAAcABAQGA + AQEBAAEDAgABwAEDAcABAwEAAQMCAAHAAQcB+AE/AcABBwIACw== </value> </data> </root> \ No newline at end of file 1.3 +5 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.cs Index: ExternalToolsOptionsPage.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- ExternalToolsOptionsPage.cs 25 Jul 2006 13:09:30 -0000 1.2 +++ ExternalToolsOptionsPage.cs 30 Jul 2006 05:33:25 -0000 1.3 @@ -104,6 +104,11 @@ txtMagicDrawPath.Text = openFileDialog1.FileName; } } + + private void button1_Click(object sender, EventArgs e) + { + m_settings.EraseAllSettings(); + } } 1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.designer.cs Index: ExternalToolsOptionsPage.designer.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.designer.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- ExternalToolsOptionsPage.designer.cs 12 Jul 2006 09:15:06 -0000 1.1 +++ ExternalToolsOptionsPage.designer.cs 30 Jul 2006 05:33:25 -0000 1.2 @@ -185,7 +185,7 @@ this.groupBox1.Size = new System.Drawing.Size(395, 49); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; - this.groupBox1.Text = "Schema Export Project"; + this.groupBox1.Text = ":"; // // txtSchemaExportCommandLine // 1.2 +13 -13 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.resx Index: ExternalToolsOptionsPage.resx =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.resx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- ExternalToolsOptionsPage.resx 12 Jul 2006 09:15:06 -0000 1.1 +++ ExternalToolsOptionsPage.resx 30 Jul 2006 05:33:25 -0000 1.2 @@ -126,21 +126,21 @@ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABO BAAAAk1TRnQBSQFMAwEBAAEEAQABBAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA - ARADAAEBAQABIAYAARASAAEGAgEBBgE7AgEBYQFKAgIBiAEzAgEBTwEEAgEBBOwAAUUCAQF6AWsBdQGB - Af8BiwGBAaMB/wFgAgMB0wE2AgEBVgEEAgEBBOgAAT0CAQFlAVMBrwL/AU8BfQHDAf8BiwGBAaMB/wFg - AgMB0wE2AgEBVgEEAgEBBOgAAV8BNgFOAfABUwGvAv8BTgF/AcYB/wGLAYEBowH/AWACAwHTATYCAQFW - AQQCAQEE6AABXwE2AU4B8AFTAa8C/wFOAX8BxgH/AYsBgQGjAf8BYAIDAdMBMAIBAUkEAAECAwEBAgMB - AQIDAQECAwHYAAFfATYBTgHwAVMBrwL/AU4BfwHGAf8BiwGBAaMB/wFDAgEBdAEdAgEBJwE/AgEBaQFN - AgIBkgFPAgIBlQFEAgEBdwEiAgEBMAEEAgEBBNQAAV8BNgFOAfABUwGvAv8DggH/AX0COQHyAbYBhQGB + ARADAAEBAQABIAYAARASAAEGAgEBBgE7AgEBYQFKAgIBiAEzAgEBTwEEAgEBBOwAAUUCAQF6AW0BdwGB + Af8BiwGBAaMB/wFgAgMB0wE2AgEBVgEEAgEBBOgAAT0CAQFlAVUBrwL/AVEBfwHDAf8BiwGBAaMB/wFg + AgMB0wE2AgEBVgEEAgEBBOgAAV8BKwE+AfABVQGvAv8BUAGBAcYB/wGLAYEBowH/AWACAwHTATYCAQFW + AQQCAQEE6AABXwErAT4B8AFVAa8C/wFQAYEBxgH/AYsBgQGjAf8BYAIDAdMBMAIBAUkEAAECAwEBAgMB + AQIDAQECAwHYAAFfASsBPgHwAVUBrwL/AVABgQHGAf8BiwGBAaMB/wFDAgEBdAEdAgEBJwE/AgEBaQFN + AgIBkgFPAgIBlQFEAgEBdwEiAgEBMAEEAgEBBNQAAV8BKwE+AfABVQGvAv8DggH/AXsCLQHyAbYBhQGB Af8B7QHSAagC/wH6AccB/wH8AfgBzAH/AdYBtgGlAf8BXgIEAdcBPgIBAWcBBgIBAQbUAAEDAgEBAgHA - ArYB/wHkAbQBlAL/AfUBygL/Af0BygP/AdYD/wHgA/8B6QH/AfoB9wHsAf8BZwINAeUBMgIBAU7UAAEC + ArYB/wHkAbQBlAL/AfUBygL/Af0BygP/AdYD/wHgA/8B6QH/AfoB9wHsAf8BZwILAeUBMgIBAU7UAAEC AwEB0gGiAZUC/wH4Ac4C/wHpAbYD/wHOA/8B3wP/Ae8J/wHoAdsBvgH/AVMCAgGh1AABHwIBASoB/wHb - AagC/wHnAbQC/wHqAbcD/wHQA/8B4AP/AfED/wH4A/8B6AP/AdgB/wFrAg8B6dQAAUsCAgGJAf8B7gHE - Av8B1gGjAv8B5AGxAv8B/QHKA/8B2gP/AeQD/wHmA/8B3wP/AdEB/wGaAnEB/9QAAS0CAQFEAf8B7AG/ - Av8B3gGtAv8B7wHCAv8B9QHCAv8B/gHMA/8B1AP/AdUD/wHQAv8B+AHKAf8BbgIdAfDYAAHwAdYBsAL/ - AfwB5wL/AfIB2wL/AdsBrAL/AfMBwAL/AfABvQL/AfABvQL/AfABvQL/AeMBsAH/AVYCAgGw2AABYQIF - AdEC/wH5Bv8B5gG7Av8B3wGvAv8B2gGnAv8B6AG1Av8B7wHFAf8BtQGEAYEB/wEYAgEBH9wAAXwCJwHw - Af8B9wHYAv8B/AHYAv8B/AHPAv8B+wHPAv8B2wGrAf8BvwGPAYUB/wEaAgEBIuQAASQCAQEyAWoCDAHi + AagC/wHnAbQC/wHqAbcD/wHQA/8B4AP/AfED/wH4A/8B6AP/AdgB/wFrAg0B6dQAAUsCAgGJAf8B7gHE + Av8B1gGjAv8B5AGxAv8B/QHKA/8B2gP/AeQD/wHmA/8B3wP/AdEB/wGaAnMB/9QAAS0CAQFEAf8B7AG/ + Av8B3gGtAv8B7wHCAv8B9QHCAv8B/gHMA/8B1AP/AdUD/wHQAv8B+AHKAf8BbgIYAfDYAAHwAdYBsAL/ + AfwB5wL/AfIB2wL/AdsBrAL/AfMBwAL/AfABvQL/AfABvQL/AfABvQL/AeMBsAH/AVYCAgGw2AABYQID + AdEC/wH5Bv8B5gG7Av8B3wGvAv8B2gGnAv8B6AG1Av8B7wHFAf8BtQGEAYEB/wEYAgEBH9wAAXgCIQHw + Af8B9wHYAv8B/AHYAv8B/AHPAv8B+wHPAv8B2wGrAf8BvwGPAYUB/wEaAgEBIuQAASQCAQEyAWcCCgHi AawCgQH/AcoClwH/AUgCAgGBAQYCAQEGyAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGA FwAD/wEAAQcB/wYAAQMB/wYAAQEB/wYAAYAB/wYAAcABhwYAAeABAQYAAfAHAAH4BwAB+AcAAfgHAAH4 BwAB+AcAAfwHAAH8BwAB/gEBBgAB/wEDBgAL 1.2 +20 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/pom.xml Index: pom.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/pom.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- pom.xml 25 Jul 2006 13:09:31 -0000 1.1 +++ pom.xml 30 Jul 2006 05:33:26 -0000 1.2 @@ -89,6 +89,26 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>${core.generated.dir}</directory> + <includes> + <include>**/*</include> + </includes> + </fileset> + <fileset> + <directory>${common.generated.dir}</directory> + <includes> + <include>**/*</include> + </includes> + </fileset> + </filesets> + </configuration> + </plugin> </plugins> </build> </project> \ No newline at end of file 1.3 +54 -17 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml/empty.model.xml Index: empty.model.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml/empty.model.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- empty.model.xml 9 Jun 2006 22:27:24 -0000 1.2 +++ empty.model.xml 30 Jul 2006 05:33:26 -0000 1.3 @@ -12,14 +12,14 @@ <XMI.content> <UML:Model xmi.id='eee_1045467100313_135436_1' name='Data' isRoot='false' isLeaf='false' isAbstract='false'> <UML:ModelElement.comment> - <UML:Comment xmi.id='_24400562_1092013275546_280654_0' name='Author:Administrator. Created:8/8/04 8:58 PM. Title:. Comment:. '/> + <UML:Comment xmi.id='_24400562_1092013275546_280654_0' name='Author:${wizard.sysinfo.currentuser}. Created:${wizard.sysinfo.currentdate}. Title:. Comment:Generated by ${wizard.android.apptitle}. '/> </UML:ModelElement.comment> <XMI.extension xmi.extender='MagicDraw UML 9.0' xmi.extenderID='MagicDraw UML 9.0'> <ignoredInModule xmi.value='true'/> </XMI.extension> <UML:Namespace.ownedElement> <UML:Package xmi.id='eee_1045467100313_365297_7' name='Component View' isRoot='false' isLeaf='false' isAbstract='false'/> - <UML:Package href='andromda-profile-3.2-RC1-SNAPSHOT.xml.zip|_8a70287_1078771814628_224704_589'> + <UML:Package href='andromda-profile-${wizard.application.andromda.version}.xml.zip|_8a70287_1078771814628_224704_589'> <XMI.extension xmi.extender='MagicDraw UML 9.0' xmi.extenderID='MagicDraw UML 9.0'> <referentPath xmi.value='::org.andromda.profile'/> </XMI.extension> @@ -56,16 +56,54 @@ <propertyID>MODULES_DIRS</propertyID> <propertyDescriptionID>MODULES_DIRS_DESCRIPTION</propertyDescriptionID> <mdElement elementClass='FileProperty'> - <value><maven1.repository>\andromda\xml.zips</value> - <selectionMode xmi.value='0'/> + <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile\3.2-SNAPSHOT\</value> + <selectionMode xmi.value='2'/> + </mdElement> + <mdElement elementClass='FileProperty'> + <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-datatype\3.2-SNAPSHOT\</value> + <selectionMode xmi.value='2'/> + </mdElement> + <mdElement elementClass='FileProperty'> + <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-meta\3.2-SNAPSHOT\</value> + <selectionMode xmi.value='2'/> + </mdElement> + <mdElement elementClass='FileProperty'> + <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-persistence\3.2-SNAPSHOT\</value> + <selectionMode xmi.value='2'/> + </mdElement> + <mdElement elementClass='FileProperty'> + <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-presentation\3.2-SNAPSHOT\</value> + <selectionMode xmi.value='2'/> + </mdElement> + <mdElement elementClass='FileProperty'> + <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-process\3.2-SNAPSHOT\</value> + <selectionMode xmi.value='2'/> + </mdElement> + <mdElement elementClass='FileProperty'> + <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-service\3.2-SNAPSHOT\</value> + <selectionMode xmi.value='2'/> + </mdElement> + <mdElement elementClass='FileProperty'> + <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profiles-uml14\3.2-SNAPSHOT\</value> + <selectionMode xmi.value='2'/> + </mdElement> + <mdElement elementClass='FileProperty'> + <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-webservice\3.2-SNAPSHOT\</value> + <selectionMode xmi.value='2'/> + </mdElement> + <mdElement elementClass='FileProperty'> + <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-xml\3.2-SNAPSHOT\</value> + <selectionMode xmi.value='2'/> </mdElement> <mdElement elementClass='FileProperty'> <value><maven1.repository>\andromda\xml.zips\</value> - <selectionMode xmi.value='0'/> + <selectionMode xmi.value='2'/> </mdElement> - <value xmi.value='false'/> + <value xmi.value='true'/> </mdElement> </mdElement> + + </mdElement> <mdElement elementClass='PropertyManager'> <name>PROJECT_INVISIBLE_PROPERTIES</name> <propertyManagerID>_9_0_2_12ab03bf_1125323139546_578921_3</propertyManagerID> @@ -177,7 +215,6 @@ <index xmi.value='-1'/> </mdElement> </mdElement> - </mdElement> <favoriteElements xmi.value=''/> </options> <componentView> 1.3 +5 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml Index: pom.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- pom.xml 27 Jul 2006 03:55:48 -0000 1.2 +++ pom.xml 30 Jul 2006 05:33:26 -0000 1.3 @@ -82,6 +82,11 @@ <artifactId>andromda-maven-plugin</artifactId> <version>${wizard.application.andromda.version}</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>2.1</version> + </plugin> </plugins> </pluginManagement> </build> 1.2 +56 -38 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/settings.xml Index: settings.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/settings.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- settings.xml 11 Jul 2006 13:45:38 -0000 1.1 +++ settings.xml 30 Jul 2006 05:33:26 -0000 1.2 @@ -4,18 +4,18 @@ <id>andromda</id> <repositories> <repository> - <id>andromda</id> - <name>AndroMDA</name> - <url>http://galaxy.andromda.org/maven2</url> + <id>ibiblio</id> + <name>IBiblio</name> + <url>http://www.ibiblio.org/maven2</url> <layout>default</layout> <snapshots> <enabled>false</enabled> </snapshots> </repository> <repository> - <id>andromda-snapshot</id> - <name>AndroMDA</name> - <url>http://galaxy.andromda.org/maven2</url> + <id>ibiblio-snapshot</id> + <name>IBiblio</name> + <url>http://www.ibiblio.org/maven2</url> <layout>default</layout> <snapshots> <enabled>true</enabled> @@ -39,9 +39,7 @@ <enabled>true</enabled> </snapshots> </repository> - </repositories> - <pluginRepositories> - <pluginRepository> + <repository> <id>andromda</id> <name>AndroMDA</name> <url>http://galaxy.andromda.org/maven2</url> @@ -49,8 +47,8 @@ <snapshots> <enabled>false</enabled> </snapshots> - </pluginRepository> - <pluginRepository> + </repository> + <repository> <id>andromda-snapshot</id> <name>AndroMDA</name> <url>http://galaxy.andromda.org/maven2</url> @@ -58,7 +56,9 @@ <snapshots> <enabled>true</enabled> </snapshots> - </pluginRepository> + </repository> + </repositories> + <pluginRepositories> <pluginRepository> <id>ibiblio</id> <name>IBiblio</name> @@ -77,6 +77,24 @@ <enabled>true</enabled> </snapshots> </pluginRepository> + <pluginRepository> + <id>andromda</id> + <name>AndroMDA</name> + <url>http://galaxy.andromda.org/maven2</url> + <layout>default</layout> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> + <id>andromda-snapshot</id> + <name>AndroMDA</name> + <url>http://galaxy.andromda.org/maven2</url> + <layout>default</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> </pluginRepositories> </profile> </profiles> 1.3 +11 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.cs Index: MDASolutionWizard.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- MDASolutionWizard.cs 25 Jul 2006 13:09:33 -0000 1.2 +++ MDASolutionWizard.cs 30 Jul 2006 05:33:26 -0000 1.3 @@ -415,6 +415,17 @@ ConfigFile config = new ConfigFile(); config.Clear(); + + try + { + config["sysinfo.currentuser"] = System.Security.Principal.WindowsIdentity.GetCurrent().Name; + } + catch { } + config["sysinfo.currentdate"] = DateTime.Now.ToLongDateString(); + + config["android.apptitle"] = "Android/VS v" + AndroMDA.VS80AddIn.VS80AddIn.ADD_IN_VERSION; + config["android.version"] = AndroMDA.VS80AddIn.VS80AddIn.ADD_IN_VERSION; + config["solution.name"] = VSSolutionUtils.GetSolutionName(m_applicationObject.Solution); config["solution.path"] = VSSolutionUtils.GetSolutionPath(m_applicationObject.Solution); 1.3 +220 -208 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/WelcomeWizard.Designer.cs Index: WelcomeWizard.Designer.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/WelcomeWizard.Designer.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- WelcomeWizard.Designer.cs 25 Jul 2006 13:09:33 -0000 1.2 +++ WelcomeWizard.Designer.cs 30 Jul 2006 05:33:26 -0000 1.3 @@ -36,6 +36,22 @@ System.Windows.Forms.ListViewGroup listViewGroup8 = new System.Windows.Forms.ListViewGroup("Maven 1 (optional)", System.Windows.Forms.HorizontalAlignment.Left); this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.wizard1 = new Gui.Wizard.Wizard(); + this.pageIssues = new Gui.Wizard.WizardPage(); + this.panel1 = new System.Windows.Forms.Panel(); + this.lblFixDescription = new System.Windows.Forms.Label(); + this.btnFix = new System.Windows.Forms.Button(); + this.lblIssueDescription = new System.Windows.Forms.RichTextBox(); + this.pnlButtonBright3d = new System.Windows.Forms.Panel(); + this.pnlButtonDark3d = new System.Windows.Forms.Panel(); + this.lstFailureDetails = new System.Windows.Forms.ListView(); + this.columnHeader3 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); + this.header1 = new Gui.Wizard.Header(); + this.pageEnvironment = new Gui.Wizard.WizardPage(); + this.lstEnvironment = new System.Windows.Forms.ListView(); + this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); + this.header6 = new Gui.Wizard.Header(); this.pageWelcome = new Gui.Wizard.WizardPage(); this.label7 = new System.Windows.Forms.Label(); this.linkLabel3 = new System.Windows.Forms.LinkLabel(); @@ -55,30 +71,15 @@ this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.pageIssues = new Gui.Wizard.WizardPage(); - this.panel1 = new System.Windows.Forms.Panel(); - this.lblFixDescription = new System.Windows.Forms.Label(); - this.btnFix = new System.Windows.Forms.Button(); - this.lblIssueDescription = new System.Windows.Forms.RichTextBox(); - this.pnlButtonBright3d = new System.Windows.Forms.Panel(); - this.pnlButtonDark3d = new System.Windows.Forms.Panel(); - this.lstFailureDetails = new System.Windows.Forms.ListView(); - this.columnHeader3 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); - this.header1 = new Gui.Wizard.Header(); - this.pageEnvironment = new Gui.Wizard.WizardPage(); - this.lstEnvironment = new System.Windows.Forms.ListView(); - this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); - this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); - this.header6 = new Gui.Wizard.Header(); + this.btnRetest = new System.Windows.Forms.Button(); this.wizard1.SuspendLayout(); + this.pageIssues.SuspendLayout(); + this.panel1.SuspendLayout(); + this.pageEnvironment.SuspendLayout(); this.pageWelcome.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit(); this.pageComplete.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.pageIssues.SuspendLayout(); - this.panel1.SuspendLayout(); - this.pageEnvironment.SuspendLayout(); this.SuspendLayout(); // // imageList1 @@ -93,10 +94,10 @@ // wizard1 // this.wizard1.ContainingForm = this; - this.wizard1.Controls.Add(this.pageWelcome); - this.wizard1.Controls.Add(this.pageEnvironment); - this.wizard1.Controls.Add(this.pageComplete); this.wizard1.Controls.Add(this.pageIssues); + this.wizard1.Controls.Add(this.pageComplete); + this.wizard1.Controls.Add(this.pageEnvironment); + this.wizard1.Controls.Add(this.pageWelcome); this.wizard1.Dock = System.Windows.Forms.DockStyle.Fill; this.wizard1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.wizard1.Location = new System.Drawing.Point(0, 0); @@ -109,6 +110,190 @@ this.wizard1.Size = new System.Drawing.Size(525, 360); this.wizard1.TabIndex = 0; // + // pageIssues + // + this.pageIssues.Controls.Add(this.panel1); + this.pageIssues.Controls.Add(this.lstFailureDetails); + this.pageIssues.Controls.Add(this.header1); + this.pageIssues.Dock = System.Windows.Forms.DockStyle.Fill; + this.pageIssues.IsFinishPage = false; + this.pageIssues.Location = new System.Drawing.Point(0, 0); + this.pageIssues.Name = "pageIssues"; + this.pageIssues.Size = new System.Drawing.Size(525, 312); + this.pageIssues.TabIndex = 8; + this.pageIssues.ShowFromBack += new System.EventHandler(this.pageIssues_ShowFromBack); + this.pageIssues.ShowFromNext += new System.EventHandler(this.pageIssues_ShowFromNext); + // + // panel1 + // + this.panel1.Controls.Add(this.lblFixDescription); + this.panel1.Controls.Add(this.btnRetest); + this.panel1.Controls.Add(this.btnFix); + this.panel1.Controls.Add(this.lblIssueDescription); + this.panel1.Controls.Add(this.pnlButtonBright3d); + this.panel1.Controls.Add(this.pnlButtonDark3d); + this.panel1.Location = new System.Drawing.Point(3, 160); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(522, 149); + this.panel1.TabIndex = 31; + // + // lblFixDescription + // + this.lblFixDescription.Location = new System.Drawing.Point(165, 121); + this.lblFixDescription.Name = "lblFixDescription"; + this.lblFixDescription.Size = new System.Drawing.Size(345, 28); + this.lblFixDescription.TabIndex = 13; + // + // btnFix + // + this.btnFix.Location = new System.Drawing.Point(84, 116); + this.btnFix.Name = "btnFix"; + this.btnFix.Size = new System.Drawing.Size(75, 23); + this.btnFix.TabIndex = 12; + this.btnFix.Text = "Fix Issue"; + this.btnFix.UseVisualStyleBackColor = true; + this.btnFix.Visible = false; + this.btnFix.Click += new System.EventHandler(this.btnFix_Click); + // + // lblIssueDescription + // + this.lblIssueDescription.BackColor = System.Drawing.SystemColors.Control; + this.lblIssueDescription.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.lblIssueDescription.Cursor = System.Windows.Forms.Cursors.Arrow; + this.lblIssueDescription.Location = new System.Drawing.Point(9, 8); + this.lblIssueDescription.Name = "lblIssueDe... [truncated message content] |