From: Chris M. <cm...@us...> - 2007-08-03 14:45:50
|
User: cmicali Date: 07/08/03 07:45:50 Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven Maven2Proxy.cs etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn WizardSolutionProcessor.cs etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards MDASolutionWizard.cs MDASolutionWizard.designer.cs WelcomeWizard.cs Log: - Added SQLServer2005 dialect to solution wizard - Added Lorna Burnet's patches Revision Changes Path 1.5 +60 -10 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.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- Maven2Proxy.cs 22 Jan 2007 13:22:42 -0000 1.4 +++ Maven2Proxy.cs 3 Aug 2007 14:45:49 -0000 1.5 @@ -41,18 +41,21 @@ if (text == string.Empty) return; else { - if (text.EndsWith("K")) + if (text.EndsWith("K") || text.EndsWith("b")) { + bool isBytes = false; + if (text.EndsWith("b")) isBytes = true; 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)); + //string progressText = current.ToString("{0:0,0}") + "/" + total.ToString("{0:0,0}") + isBytes ? "b" : "K"; OutputWindow.DTE.StatusBar.Progress(true, "AndroMDA: Maven: Downloading file... " + text, current, total); cancelOutput = true; } } - else if (text.EndsWith("K downloaded")) + else if (text.EndsWith("K downloaded") || text.EndsWith("b downloaded")) { OutputWindow.DTE.StatusBar.Progress(false, "Android/VS: Generation Progress",0,0); } @@ -74,26 +77,73 @@ string maven_cmd_line_args = m_mavenOptions; string classworlds_jar = string.Empty; - if (java_home == null || java_home == string.Empty) + if (string.IsNullOrEmpty(java_home)) { - throw new MavenProxyKnownException("Error: Maven cannot run because the JAVA_HOME environment variable is not set.\nError: Please check your java installation."); + throw new MavenProxyKnownException( + "Error: Maven cannot run because the JAVA_HOME environment variable is not set.\n" + + "Error: Please check your java installation."); } - if (maven_home == null || maven_home == string.Empty) + if (string.IsNullOrEmpty(maven_home)) { - throw new MavenProxyKnownException("Error: Maven cannot run because the M2_HOME environment variable is not set.\nError: Please check that maven 2.x has been correctly installed."); + throw new MavenProxyKnownException( + "Error: Maven cannot run because the M2_HOME environment variable is not set.\n" + + "Error: Please check that maven 2.x has been correctly installed."); } - if (maven_opts == null || maven_opts == string.Empty) + if (string.IsNullOrEmpty(maven_opts)) { maven_opts = "-Xmx256m"; } - string[] classworldJars = System.IO.Directory.GetFiles(maven_home + "\\core\\boot", "classworlds-*.jar", System.IO.SearchOption.TopDirectoryOnly); + string bootPath = maven_home + @"\core\boot"; + + if (!System.IO.Directory.Exists(bootPath)) + { + bootPath = maven_home + @"\boot"; + } + + if (!System.IO.Directory.Exists(bootPath)) + { + throw new MavenProxyKnownException( + "Error: Maven cannot run because the M2_HOME boot folder does not exist.\n" + + "Error: Please check that maven 2.x has been correctly installed."); + } + + string[] classworldJars = null; + + try + { + classworldJars = System.IO.Directory.GetFiles( + bootPath, + "classworlds-*.jar", + System.IO.SearchOption.TopDirectoryOnly); + } + catch (Exception ex) + { + throw new MavenProxyKnownException( + "Error: " + ex.Message + "\n" + + "Error: Please check that maven 2.x has been correctly installed."); + } + + if (classworldJars == null + || classworldJars.Length < 1 + || string.IsNullOrEmpty(classworldJars[0])) + { + throw new MavenProxyKnownException( + "Error: Maven cannot run because the boot class path cannot be constructed.\n" + + "Error: Please check that maven 2.x has been correctly installed."); + } + + classworlds_jar = classworldJars[0]; this.ExecutablePath = maven_java_exe; - this.CommandLine = maven_opts + " -classpath \"" + classworlds_jar + "\" \"-Dclassworlds.conf=" + maven_home + "\\bin\\m2.conf\" " + - "\"-Dmaven.home=" + maven_home + "\" org.codehaus.classworlds.Launcher "; + this.CommandLine = + maven_opts + + @" -classpath """ + classworlds_jar + @"""" + + @" ""-Dclassworlds.conf=" + maven_home + @"\bin\m2.conf""" + + @" ""-Dmaven.home=" + maven_home + @"""" + + @" org.codehaus.classworlds.Launcher "; this.CommandLine += maven_cmd_line_args; 1.18 +3 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs Index: WizardSolutionProcessor.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -r1.17 -r1.18 --- WizardSolutionProcessor.cs 1 Aug 2007 05:10:37 -0000 1.17 +++ WizardSolutionProcessor.cs 3 Aug 2007 14:45:49 -0000 1.18 @@ -321,7 +321,7 @@ // Write the nhibernate.config if required if (GetConfigSettingBool("projects.web.usenhibernateconfig")) { - WriteFile("Web/nhibernate.config", webProject.Name + "nhibernate.config", WriteFileProperties.DestinationPathAlreadyComplete); + WriteFile("Web/nhibernate.config", webProject.Name + "nhibernate.config", WriteFileProperties.DestinationPathAlreadyComplete | WriteFileProperties.ParseVariables); } string webConfigDstFile = webProject.Name + "Web.config"; @@ -329,7 +329,7 @@ if (!System.IO.File.Exists(webConfigDstFile)) { // Write out the web.config file - WriteFile("Web/web.config", webConfigDstFile, WriteFileProperties.DestinationPathAlreadyComplete); + WriteFile("Web/web.config", webConfigDstFile, WriteFileProperties.DestinationPathAlreadyComplete | WriteFileProperties.ParseVariables); webProject.ProjectItems.AddFromFile(webConfigDstFile); } @@ -498,7 +498,7 @@ AddToStatus("Using existing testing project " + m_configuration["projects.tests.name"] + "..."); testProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.tests.name"], m_applicationObject.Solution); } - WriteFile("Tests/App.config", m_configuration["projects.tests.dir"] + "/App.config"); + WriteFile("Tests/App.config", m_configuration["projects.tests.dir"] + "/App.config", WriteFileProperties.RenderTemplate | WriteFileProperties.ParseVariables); WriteFile("Tests/nhibernate.config", m_configuration["projects.tests.dir"] + "/nhibernate.config"); ProjectItem appConfig = testProject.ProjectItems.AddFromFile(m_dstPath + m_configuration["projects.tests.dir"] + "\\App.config"); 1.8 +8 -2 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.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- MDASolutionWizard.cs 1 Aug 2007 05:10:39 -0000 1.7 +++ MDASolutionWizard.cs 3 Aug 2007 14:45:49 -0000 1.8 @@ -464,7 +464,7 @@ cbConfigureUnitTestingProject.Checked = true; cbConfigureUnitTestingProject.Checked = false; - txtAndroMDAVersion.Text = "3.2"; + txtAndroMDAVersion.Text = "3.3-SNAPSHOT"; txtDotNetCartridgesVersion.Text = "1.2-SNAPSHOT"; } @@ -558,7 +558,13 @@ // TODO: Support all database types that NHibernate supports switch (ddlDatabaseType.SelectedItem.ToString()) { - case "Microsoft SQL Server": + case "Microsoft SQL Server 2005": + config["database.mappingtype"] = "MSSQL"; + config["database.hibernatedialect"] = "net.sf.hibernate.dialect.SQLServerDialect"; + config["database.nhibernatedialect"] = "NHibernate.Dialect.MsSql2005Dialect"; + config["hibernate.connection.driver_class"] = "NHibernate.Driver.SqlClientDriver"; + break; + case "Microsoft SQL Server 2000": config["database.mappingtype"] = "MSSQL"; config["database.hibernatedialect"] = "net.sf.hibernate.dialect.SQLServerDialect"; config["database.nhibernatedialect"] = "NHibernate.Dialect.MsSql2000Dialect"; 1.8 +784 -783 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs Index: MDASolutionWizard.designer.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- MDASolutionWizard.designer.cs 1 Aug 2007 05:10:39 -0000 1.7 +++ MDASolutionWizard.designer.cs 3 Aug 2007 14:45:50 -0000 1.8 @@ -32,6 +32,33 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard)); this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.wizard1 = new Gui.Wizard.Wizard(); + this.wizardPageAdvancedSettings = new Gui.Wizard.WizardPage(); + this.txtDotNetCartridgesVersion = new System.Windows.Forms.TextBox(); + this.txtAndroMDAVersion = new System.Windows.Forms.TextBox(); + this.lblUseZippedModel = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.ddlAndroMDABootstrap = new System.Windows.Forms.ComboBox(); + this.label5 = new System.Windows.Forms.Label(); + this.lblUseZippedModelDescription = new System.Windows.Forms.Label(); + this.cbUseZippedModel = new System.Windows.Forms.CheckBox(); + this.header9 = new Gui.Wizard.Header(); + this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage(); + this.cbShowAdvancedOptions = new System.Windows.Forms.CheckBox(); + this.ddlVersionControl = new System.Windows.Forms.ComboBox(); + this.ddlDatabaseType = new System.Windows.Forms.ComboBox(); + this.label10 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.txtApplicationName = new System.Windows.Forms.TextBox(); + this.label12 = new System.Windows.Forms.Label(); + this.header6 = new Gui.Wizard.Header(); + this.wizardPageWelcome = new Gui.Wizard.WizardPage(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label9 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.pictureBoxWelcome = new System.Windows.Forms.PictureBox(); this.wizardPageComplete = new Gui.Wizard.WizardPage(); this.lnkViewLog = new System.Windows.Forms.LinkLabel(); this.lblFinishPageTitle = new System.Windows.Forms.Label(); @@ -83,34 +110,11 @@ this.wizardPageCommonProject = new Gui.Wizard.WizardPage(); this.usrCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl(); this.header1 = new Gui.Wizard.Header(); - this.wizardPageAdvancedSettings = new Gui.Wizard.WizardPage(); - this.txtAndroMDAVersion = new System.Windows.Forms.TextBox(); - this.lblUseZippedModel = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.ddlAndroMDABootstrap = new System.Windows.Forms.ComboBox(); - this.label5 = new System.Windows.Forms.Label(); - this.lblUseZippedModelDescription = new System.Windows.Forms.Label(); - this.cbUseZippedModel = new System.Windows.Forms.CheckBox(); - this.header9 = new Gui.Wizard.Header(); - this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage(); - this.cbShowAdvancedOptions = new System.Windows.Forms.CheckBox(); - this.ddlVersionControl = new System.Windows.Forms.ComboBox(); - this.ddlDatabaseType = new System.Windows.Forms.ComboBox(); - this.label10 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.txtApplicationName = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); - this.header6 = new Gui.Wizard.Header(); - this.wizardPageWelcome = new Gui.Wizard.WizardPage(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label9 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.pictureBoxWelcome = new System.Windows.Forms.PictureBox(); - this.label3 = new System.Windows.Forms.Label(); - this.txtDotNetCartridgesVersion = new System.Windows.Forms.TextBox(); this.wizard1.SuspendLayout(); + this.wizardPageAdvancedSettings.SuspendLayout(); + this.wizardPageSolutionInfo.SuspendLayout(); + this.wizardPageWelcome.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit(); this.wizardPageComplete.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit(); this.wizardPageProcessing.SuspendLayout(); @@ -122,10 +126,6 @@ this.wizardPageSchemaExportProject.SuspendLayout(); this.wizardPageCoreProject.SuspendLayout(); this.wizardPageCommonProject.SuspendLayout(); - this.wizardPageAdvancedSettings.SuspendLayout(); - this.wizardPageSolutionInfo.SuspendLayout(); - this.wizardPageWelcome.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit(); this.SuspendLayout(); // // imageList1 @@ -171,905 +171,906 @@ this.wizard1.TabIndex = 0; this.wizard1.Load += new System.EventHandler(this.wizard1_Load); // - // wizardPageComplete + // wizardPageAdvancedSettings // - this.wizardPageComplete.BackColor = System.Drawing.Color.White; - this.wizardPageComplete.Controls.Add(this.lnkViewLog); - this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle); - this.wizardPageComplete.Controls.Add(this.pictureBoxComplete); - this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription); - this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage); - this.wizardPageComplete.Controls.Add(this.txtErrorMessage); - this.wizardPageComplete.Controls.Add(this.lstLog); - this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageComplete.IsFinishPage = true; - this.wizardPageComplete.Location = new System.Drawing.Point(0, 0); - this.wizardPageComplete.Name = "wizardPageComplete"; - this.wizardPageComplete.Size = new System.Drawing.Size(525, 312); - this.wizardPageComplete.TabIndex = 7; - this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext); + this.wizardPageAdvancedSettings.Controls.Add(this.txtDotNetCartridgesVersion); + this.wizardPageAdvancedSettings.Controls.Add(this.txtAndroMDAVersion); + this.wizardPageAdvancedSettings.Controls.Add(this.lblUseZippedModel); + this.wizardPageAdvancedSettings.Controls.Add(this.label3); + this.wizardPageAdvancedSettings.Controls.Add(this.label6); + this.wizardPageAdvancedSettings.Controls.Add(this.ddlAndroMDABootstrap); + this.wizardPageAdvancedSettings.Controls.Add(this.label5); + this.wizardPageAdvancedSettings.Controls.Add(this.lblUseZippedModelDescription); + this.wizardPageAdvancedSettings.Controls.Add(this.cbUseZippedModel); + this.wizardPageAdvancedSettings.Controls.Add(this.header9); + this.wizardPageAdvancedSettings.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardPageAdvancedSettings.IsFinishPage = false; + this.wizardPageAdvancedSettings.Location = new System.Drawing.Point(0, 0); + this.wizardPageAdvancedSettings.Name = "wizardPageAdvancedSettings"; + this.wizardPageAdvancedSettings.Size = new System.Drawing.Size(525, 312); + this.wizardPageAdvancedSettings.TabIndex = 11; + this.wizardPageAdvancedSettings.ShowFromBack += new System.EventHandler(this.wizardPageAdvancedSettings_ShowFromBack); + this.wizardPageAdvancedSettings.ShowFromNext += new System.EventHandler(this.wizardPageAdvancedSettings_ShowFromNext); // - // lnkViewLog + // txtDotNetCartridgesVersion // - this.lnkViewLog.AutoSize = true; - this.lnkViewLog.Location = new System.Drawing.Point(210, 111); - this.lnkViewLog.Name = "lnkViewLog"; - this.lnkViewLog.Size = new System.Drawing.Size(49, 13); - this.lnkViewLog.TabIndex = 16; - this.lnkViewLog.TabStop = true; - this.lnkViewLog.Text = "View Log"; - this.lnkViewLog.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + this.txtDotNetCartridgesVersion.BackColor = System.Drawing.SystemColors.Window; + this.txtDotNetCartridgesVersion.Location = new System.Drawing.Point(30, 152); + this.txtDotNetCartridgesVersion.Name = "txtDotNetCartridgesVersion"; + this.txtDotNetCartridgesVersion.Size = new System.Drawing.Size(394, 21); + this.txtDotNetCartridgesVersion.TabIndex = 1; // - // lblFinishPageTitle + // txtAndroMDAVersion // - this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9); - this.lblFinishPageTitle.Name = "lblFinishPageTitle"; - this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36); - this.lblFinishPageTitle.TabIndex = 15; - this.lblFinishPageTitle.Text = "Solution Update Complete"; - this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.txtAndroMDAVersion.BackColor = System.Drawing.SystemColors.Window; + this.txtAndroMDAVersion.Location = new System.Drawing.Point(30, 103); + this.txtAndroMDAVersion.Name = "txtAndroMDAVersion"; + this.txtAndroMDAVersion.Size = new System.Drawing.Size(394, 21); + this.txtAndroMDAVersion.TabIndex = 1; // - // pictureBoxComplete + // lblUseZippedModel // - this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left; - this.pictureBoxComplete.Image = global::AndroMDA.VS80AddIn.Resource1.orange; - this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0); - this.pictureBoxComplete.Name = "pictureBoxComplete"; - this.pictureBoxComplete.Size = new System.Drawing.Size(164, 312); - this.pictureBoxComplete.TabIndex = 13; - this.pictureBoxComplete.TabStop = false; + this.lblUseZippedModel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblUseZippedModel.Location = new System.Drawing.Point(9, 228); + this.lblUseZippedModel.Name = "lblUseZippedModel"; + this.lblUseZippedModel.Size = new System.Drawing.Size(507, 16); + this.lblUseZippedModel.TabIndex = 32; + this.lblUseZippedModel.Text = "Do you want to use a zipped model file?"; + this.lblUseZippedModel.Visible = false; // - // lblFinishPageDescription + // label3 // - this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49); - this.lblFinishPageDescription.Name = "lblFinishPageDescription"; - this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 62); - this.lblFinishPageDescription.TabIndex = 12; - this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" + - "tion. You can now add classes to the solution model file and generate code base" + - "d on the model.\r\n"; + this.label3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.Location = new System.Drawing.Point(9, 130); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(507, 16); + this.label3.TabIndex = 32; + this.label3.Text = "What version of the .NET cartridges should your project use?"; // - // lblFinishPageTitleImage + // label6 // - this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.lblFinishPageTitleImage.ImageIndex = 0; - this.lblFinishPageTitleImage.ImageList = this.imageList1; - this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9); - this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage"; - this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36); - this.lblFinishPageTitleImage.TabIndex = 11; - this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.label6.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label6.Location = new System.Drawing.Point(9, 81); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(507, 16); + this.label6.TabIndex = 32; + this.label6.Text = "What version of AndroMDA should your project use?"; // - // txtErrorMessage + // ddlAndroMDABootstrap // - this.txtErrorMessage.BackColor = System.Drawing.Color.White; - this.txtErrorMessage.Location = new System.Drawing.Point(174, 49); - this.txtErrorMessage.Multiline = true; - this.txtErrorMessage.Name = "txtErrorMessage"; - this.txtErrorMessage.ReadOnly = true; - this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtErrorMessage.Size = new System.Drawing.Size(334, 230); - this.txtErrorMessage.TabIndex = 14; + this.ddlAndroMDABootstrap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlAndroMDABootstrap.FormattingEnabled = true; + this.ddlAndroMDABootstrap.Items.AddRange(new object[] { + "Apache Maven 2.x", + "Apache Maven 1.x"}); + this.ddlAndroMDABootstrap.Location = new System.Drawing.Point(30, 201); + this.ddlAndroMDABootstrap.Name = "ddlAndroMDABootstrap"; + this.ddlAndroMDABootstrap.Size = new System.Drawing.Size(394, 21); + this.ddlAndroMDABootstrap.TabIndex = 0; + this.ddlAndroMDABootstrap.Visible = false; + this.ddlAndroMDABootstrap.SelectedIndexChanged += new System.EventHandler(this.ddlAndroMDABootstrap_SelectedIndexChanged); // - // lstLog + // label5 // - this.lstLog.FormattingEnabled = true; - this.lstLog.HorizontalScrollbar = true; - this.lstLog.Location = new System.Drawing.Point(174, 49); - this.lstLog.Name = "lstLog"; - this.lstLog.Size = new System.Drawing.Size(339, 251); - this.lstLog.TabIndex = 17; - this.lstLog.Visible = false; + this.label5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label5.Location = new System.Drawing.Point(9, 179); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(507, 16); + this.label5.TabIndex = 30; + this.label5.Text = "Which program should your project use to launch AndroMDA?"; + this.label5.Visible = false; // - // wizardPageProcessing + // lblUseZippedModelDescription // - this.wizardPageProcessing.Controls.Add(this.pictureBoxThrobber); - this.wizardPageProcessing.Controls.Add(this.lstStatus); - this.wizardPageProcessing.Controls.Add(this.label7); - this.wizardPageProcessing.Controls.Add(this.header5); - this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageProcessing.IsFinishPage = false; - this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0); - this.wizardPageProcessing.Name = "wizardPageProcessing"; - this.wizardPageProcessing.Size = new System.Drawing.Size(525, 312); - this.wizardPageProcessing.TabIndex = 6; - this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext); + this.lblUseZippedModelDescription.Location = new System.Drawing.Point(27, 267); + this.lblUseZippedModelDescription.Name = "lblUseZippedModelDescription"; + this.lblUseZippedModelDescription.Size = new System.Drawing.Size(428, 30); + this.lblUseZippedModelDescription.TabIndex = 29; + this.lblUseZippedModelDescription.Text = "This option will instruct the wizard to emit the empty model as an XMI file insid" + + "e a zip file, instead of plain XMI file"; + this.lblUseZippedModelDescription.Visible = false; // - // pictureBoxThrobber + // cbUseZippedModel // - this.pictureBoxThrobber.BackColor = System.Drawing.Color.Transparent; - this.pictureBoxThrobber.Image = global::AndroMDA.VS80AddIn.Resource1.indicator_arrows; - this.pictureBoxThrobber.Location = new System.Drawing.Point(227, 77); - this.pictureBoxThrobber.Name = "pictureBoxThrobber"; - this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 17); - this.pictureBoxThrobber.TabIndex = 10; - this.pictureBoxThrobber.TabStop = false; + this.cbUseZippedModel.AutoSize = true; + this.cbUseZippedModel.Enabled = false; + this.cbUseZippedModel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbUseZippedModel.Location = new System.Drawing.Point(30, 248); + this.cbUseZippedModel.Name = "cbUseZippedModel"; + this.cbUseZippedModel.Size = new System.Drawing.Size(126, 17); + this.cbUseZippedModel.TabIndex = 2; + this.cbUseZippedModel.Text = "Use zipped model file"; + this.cbUseZippedModel.UseVisualStyleBackColor = true; + this.cbUseZippedModel.Visible = false; // - // lstStatus - // - this.lstStatus.FormattingEnabled = true; - this.lstStatus.Location = new System.Drawing.Point(12, 100); - this.lstStatus.Name = "lstStatus"; - this.lstStatus.Size = new System.Drawing.Size(501, 199); - this.lstStatus.TabIndex = 9; - // - // label7 + // header9 // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(12, 77); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(209, 13); - this.label7.TabIndex = 8; - this.label7.Text = "Updating solution to support AndroMDA..."; + this.header9.BackColor = System.Drawing.SystemColors.Control; + this.header9.CausesValidation = false; + this.header9.Description = "You can fine tune the output of the solution wizard with these settings."; + this.header9.Dock = System.Windows.Forms.DockStyle.Top; + this.header9.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; + this.header9.Location = new System.Drawing.Point(0, 0); + this.header9.Name = "header9"; + this.header9.Size = new System.Drawing.Size(525, 65); + this.header9.TabIndex = 27; + this.header9.Title = "Advanced Settings"; // - // header5 + // wizardPageSolutionInfo // - this.header5.BackColor = System.Drawing.SystemColors.Control; - this.header5.CausesValidation = false; - this.header5.Description = "Please wait..."; - this.header5.Dock = System.Windows.Forms.DockStyle.Top; - this.header5.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; - this.header5.Location = new System.Drawing.Point(0, 0); - this.header5.Name = "header5"; - this.header5.Size = new System.Drawing.Size(525, 65); - this.header5.TabIndex = 6; - this.header5.Title = "Processing Solution"; + this.wizardPageSolutionInfo.Controls.Add(this.cbShowAdvancedOptions); + this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl); + this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType); + this.wizardPageSolutionInfo.Controls.Add(this.label10); + this.wizardPageSolutionInfo.Controls.Add(this.label1); + this.wizardPageSolutionInfo.Controls.Add(this.label17); + this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationName); + this.wizardPageSolutionInfo.Controls.Add(this.label12); + this.wizardPageSolutionInfo.Controls.Add(this.header6); + this.wizardPageSolutionInfo.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardPageSolutionInfo.IsFinishPage = false; + this.wizardPageSolutionInfo.Location = new System.Drawing.Point(0, 0); + this.wizardPageSolutionInfo.Name = "wizardPageSolutionInfo"; + this.wizardPageSolutionInfo.Size = new System.Drawing.Size(525, 312); + this.wizardPageSolutionInfo.TabIndex = 8; + this.wizardPageSolutionInfo.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSolutionInfo_CloseFromNext); + this.wizardPageSolutionInfo.ShowFromBack += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext); + this.wizardPageSolutionInfo.ShowFromNext += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext); // - // wizardPageConfirmChoices + // cbShowAdvancedOptions // - this.wizardPageConfirmChoices.Controls.Add(this.lstChoiceOverview); - this.wizardPageConfirmChoices.Controls.Add(this.header4); - this.wizardPageConfirmChoices.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageConfirmChoices.IsFinishPage = false; - this.wizardPageConfirmChoices.Location = new System.Drawing.Point(0, 0); - this.wizardPageConfirmChoices.Name = "wizardPageConfirmChoices"; - this.wizardPageConfirmChoices.Size = new System.Drawing.Size(525, 312); - this.wizardPageConfirmChoices.TabIndex = 5; - this.wizardPageConfirmChoices.ShowFromNext += new System.EventHandler(this.wizardPageConfirmChoices_ShowFromNext); + this.cbShowAdvancedOptions.AutoSize = true; + this.cbShowAdvancedOptions.Location = new System.Drawing.Point(30, 249); + this.cbShowAdvancedOptions.Name = "cbShowAdvancedOptions"; + this.cbShowAdvancedOptions.Size = new System.Drawing.Size(140, 17); + this.cbShowAdvancedOptions.TabIndex = 3; + this.cbShowAdvancedOptions.Text = "Show advanced options"; + this.cbShowAdvancedOptions.UseVisualStyleBackColor = true; // - // lstChoiceOverview + // ddlVersionControl // - this.lstChoiceOverview.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader1, - this.columnHeader2}); - this.lstChoiceOverview.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; - this.lstChoiceOverview.Location = new System.Drawing.Point(12, 71); - this.lstChoiceOverview.Name = "lstChoiceOverview"; - this.lstChoiceOverview.Size = new System.Drawing.Size(501, 228); - this.lstChoiceOverview.TabIndex = 6; - this.lstChoiceOverview.UseCompatibleStateImageBehavior = false; - this.lstChoiceOverview.View = System.Windows.Forms.View.Details; + this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlVersionControl.FormattingEnabled = true; + this.ddlVersionControl.Items.AddRange(new object[] { + "None", + "CVS"}); + this.ddlVersionControl.Location = new System.Drawing.Point(30, 201); + this.ddlVersionControl.Name = "ddlVersionControl"; + this.ddlVersionControl.Size = new System.Drawing.Size(394, 21); + this.ddlVersionControl.TabIndex = 2; // - // columnHeader1 + // ddlDatabaseType // - this.columnHeader1.Text = "Feature"; - this.columnHeader1.Width = 236; + this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.ddlDatabaseType.FormattingEnabled = true; + this.ddlDatabaseType.Items.AddRange(new object[] { + "Microsoft SQL Server 2005", + "Microsoft SQL Server 2000", + "MySQL", + "Oracle 9i", + "PostgreSQL", + "Hypersonic"}); + this.ddlDatabaseType.Location = new System.Drawing.Point(30, 152); + this.ddlDatabaseType.Name = "ddlDatabaseType"; + this.ddlDatabaseType.Size = new System.Drawing.Size(394, 21); + this.ddlDatabaseType.TabIndex = 1; // - // columnHeader2 + // label10 // - this.columnHeader2.Text = "Value"; - this.columnHeader2.Width = 235; + this.label10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label10.Location = new System.Drawing.Point(9, 230); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(507, 16); + this.label10.TabIndex = 6; + this.label10.Text = "Would you like to use a specific version of AndroMDA?"; // - // header4 + // label1 // - this.header4.BackColor = System.Drawing.SystemColors.Control; - this.header4.CausesValidation = false; - this.header4.Description = "Please confirm the choices you have selected. Click Next to begin processing you" + - "r solution."; - this.header4.Dock = System.Windows.Forms.DockStyle.Top; - this.header4.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; - this.header4.Location = new System.Drawing.Point(0, 0); - this.header4.Name = "header4"; - this.header4.Size = new System.Drawing.Size(525, 65); - this.header4.TabIndex = 5; - this.header4.Title = "Confirm Choices"; + this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(9, 179); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(507, 16); + this.label1.TabIndex = 6; + this.label1.Text = "Which version control system will you be using, if any?"; // - // wizardPageWebCommonProject + // label17 // - this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelectedImage); - this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelected); - this.wizardPageWebCommonProject.Controls.Add(this.cbConfigureWebCommonProject); - this.wizardPageWebCommonProject.Controls.Add(this.usrWebCommonProject); - this.wizardPageWebCommonProject.Controls.Add(this.header8); - this.wizardPageWebCommonProject.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageWebCommonProject.IsFinishPage = false; - this.wizardPageWebCommonProject.Location = new System.Drawing.Point(0, 0); - this.wizardPageWebCommonProject.Name = "wizardPageWebCommonProject"; - this.wizardPageWebCommonProject.Size = new System.Drawing.Size(525, 312); - this.wizardPageWebCommonProject.TabIndex = 10; - this.wizardPageWebCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebCommonProject_CloseFromNext); - this.wizardPageWebCommonProject.ShowFromBack += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromBack); - this.wizardPageWebCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromNext); + this.label17.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label17.Location = new System.Drawing.Point(9, 130); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(507, 16); + this.label17.TabIndex = 4; + this.label17.Text = "Which database server will your application use?"; // - // lblMembershipSelectedImage + // txtApplicationName // - this.lblMembershipSelectedImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblMembershipSelectedImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblMembershipSelectedImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.lblMembershipSelectedImage.ImageIndex = 0; - this.lblMembershipSelectedImage.ImageList = this.imageList1; - this.lblMembershipSelectedImage.Location = new System.Drawing.Point(48, 210); - this.lblMembershipSelectedImage.Name = "lblMembershipSelectedImage"; - this.lblMembershipSelectedImage.Size = new System.Drawing.Size(35, 36); - this.lblMembershipSelectedImage.TabIndex = 36; - this.lblMembershipSelectedImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.lblMembershipSelectedImage.Visible = false; + this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window; + this.txtApplicationName.Location = new System.Drawing.Point(30, 103); + this.txtApplicationName.Name = "txtApplicationName"; + this.txtApplicationName.Size = new System.Drawing.Size(394, 21); + this.txtApplicationName.TabIndex = 0; // - // lblMembershipSelected + // label12 // - this.lblMembershipSelected.Location = new System.Drawing.Point(89, 210); - this.lblMembershipSelected.Name = "lblMembershipSelected"; - this.lblMembershipSelected.Size = new System.Drawing.Size(357, 47); - this.lblMembershipSelected.TabIndex = 35; - this.lblMembershipSelected.Text = "You selected membership support on the previous page which requires a web common " + - "project. Please enter the name of the new project or select an existing class l" + - "ibrary project."; - this.lblMembershipSelected.Visible = false; + this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.Location = new System.Drawing.Point(9, 81); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(507, 16); + this.label12.TabIndex = 0; + this.label12.Text = "What is the name of your application? (Example: Time Tracker)"; // - // cbConfigureWebCommonProject + // header6 // - this.cbConfigureWebCommonProject.AutoSize = true; - this.cbConfigureWebCommonProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbConfigureWebCommonProject.Location = new System.Drawing.Point(12, 80); - this.cbConfigureWebCommonProject.Name = "cbConfigureWebCommonProject"; - this.cbConfigureWebCommonProject.Size = new System.Drawing.Size(202, 17); - this.cbConfigureWebCommonProject.TabIndex = 0; - this.cbConfigureWebCommonProject.Text = "Configure web common project"; - this.cbConfigureWebCommonProject.UseVisualStyleBackColor = true; - this.cbConfigureWebCommonProject.CheckedChanged += new System.EventHandler(this.cbEnableWebCommonProject_CheckedChanged); + this.header6.BackColor = System.Drawing.SystemColors.Control; + this.header6.CausesValidation = false; + this.header6.Description = "Please enter the following general information about your applicaiton."; + this.header6.Dock = System.Windows.Forms.DockStyle.Top; + this.header6.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; + this.header6.Location = new System.Drawing.Point(0, 0); + this.header6.Name = "header6"; + this.header6.Size = new System.Drawing.Size(525, 65); + this.header6.TabIndex = 26; + this.header6.Title = "Application Information"; // - // usrWebCommonProject + // wizardPageWelcome // - this.usrWebCommonProject.Location = new System.Drawing.Point(30, 102); - this.usrWebCommonProject.Name = "usrWebCommonProject"; - this.usrWebCommonProject.ProjectName = ""; - this.usrWebCommonProject.Size = new System.Drawing.Size(416, 93); - this.usrWebCommonProject.TabIndex = 1; + this.wizardPageWelcome.BackColor = System.Drawing.Color.White; + this.wizardPageWelcome.Controls.Add(this.groupBox1); + this.wizardPageWelcome.Controls.Add(this.label9); + this.wizardPageWelcome.Controls.Add(this.label2); + this.wizardPageWelcome.Controls.Add(this.label8); + this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome); + this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardPageWelcome.IsFinishPage = false; + this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0); + this.wizardPageWelcome.Name = "wizardPageWelcome"; + this.wizardPageWelcome.Size = new System.Drawing.Size(525, 312); + this.wizardPageWelcome.TabIndex = 1; // - // header8 + // groupBox1 // - this.header8.BackColor = System.Drawing.SystemColors.Control; - this.header8.CausesValidation = false; - this.header8.Description = "The web common project is a class library that contains web site support classes." + - ""; - this.header8.Dock = System.Windows.Forms.DockStyle.Top; - this.header8.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; - this.header8.Location = new System.Drawing.Point(0, 0); - this.header8.Name = "header8"; - this.header8.Size = new System.Drawing.Size(525, 65); - this.header8.TabIndex = 28; - this.header8.Title = "Web Common Project"; + this.groupBox1.Location = new System.Drawing.Point(173, 31); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(345, 4); + this.groupBox1.TabIndex = 10; + this.groupBox1.TabStop = false; // - // wizardPageWebProject + // label9 // - this.wizardPageWebProject.Controls.Add(this.cbConfigureWebProject); - this.wizardPageWebProject.Controls.Add(this.usrWebProject); - this.wizardPageWebProject.Controls.Add(this.lblASPNETCartridge); - this.wizardPageWebProject.Controls.Add(this.lblStoreSettingsInNHibernateConfigDescription); - this.wizardPageWebProject.Controls.Add(this.lblAddMembershipSupportText); - this.wizardPageWebProject.Controls.Add(this.cbConfigureASPNETCartridge); - this.wizardPageWebProject.Controls.Add(this.cbUseNHibernateConfig); - this.wizardPageWebProject.Controls.Add(this.cbAddMembershipSupport); - this.wizardPageWebProject.Controls.Add(this.header7); - this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageWebProject.IsFinishPage = false; - this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0); - this.wizardPageWebProject.Name = "wizardPageWebProject"; - this.wizardPageWebProject.Size = new System.Drawing.Size(525, 312); - this.wizardPageWebProject.TabIndex = 9; - this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext); - this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext); + this.label9.Location = new System.Drawing.Point(180, 60); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(339, 220); + this.label9.TabIndex = 9; + this.label9.Text = resources.GetString("label9.Text"); // - // cbConfigureWebProject + // label2 // - this.cbConfigureWebProject.AutoSize = true; - this.cbConfigureWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbConfigureWebProject.Location = new System.Drawing.Point(12, 80); - this.cbConfigureWebProject.Name = "cbConfigureWebProject"; - this.cbConfigureWebProject.Size = new System.Drawing.Size(150, 17); - this.cbConfigureWebProject.TabIndex = 0; - this.cbConfigureWebProject.Text = "Configure web project"; - this.cbConfigureWebProject.UseVisualStyleBackColor = true; - this.cbConfigureWebProject.CheckedChanged += new System.EventHandler(this.cbAddWebProjectSupport_CheckedChanged); + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label2.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.label2.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(173, 38); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(343, 23); + this.label2.TabIndex = 8; + this.label2.Text = "Welcome"; // - // usrWebProject + // label8 // - this.usrWebProject.Location = new System.Drawing.Point(30, 102); - this.usrWebProject.Name = "usrWebProject"; - this.usrWebProject.ProjectName = ""; - this.usrWebProject.Size = new System.Drawing.Size(431, 93); - this.usrWebProject.TabIndex = 1; - this.usrWebProject.WebProjectMode = true; + this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label8.Location = new System.Drawing.Point(173, 9); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(343, 23); + this.label8.TabIndex = 8; + this.label8.Text = "AndroMDA Solution Wizard"; // - // lblASPNETCartridge + // pictureBoxWelcome // - this.lblASPNETCartridge.Location = new System.Drawing.Point(287, 271); - this.lblASPNETCartridge.Name = "lblASPNETCartridge"; - this.lblASPNETCartridge.Size = new System.Drawing.Size(225, 30); - this.lblASPNETCartridge.TabIndex = 3; - this.lblASPNETCartridge.Text = "Configure and enable the ASP.NET cartridge. Note: This feature is experimental"; - this.lblASPNETCartridge.Click += new System.EventHandler(this.lblStoreSettingsInNHibernateConfigDescription_Click); + this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBoxWelcome.Image = global::AndroMDA.VS80AddIn.Resource1.orange; + this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0); + this.pictureBoxWelcome.Name = "pictureBoxWelcome"; + this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 312); + this.pictureBoxWelcome.TabIndex = 1; + this.pictureBoxWelcome.TabStop = false; // - // lblStoreSettingsInNHibernateConfigDescription + // wizardPageComplete // - this.lblStoreSettingsInNHibernateConfigDescription.Location = new System.Drawing.Point(47, 271); - this.lblStoreSettingsInNHibernateConfigDescription.Name = "lblStoreSettingsInNHibernateConfigDescription"; - this.lblStoreSettingsInNHibernateConfigDescription.Size = new System.Drawing.Size(261, 30); - this.lblStoreSettingsInNHibernateConfigDescription.TabIndex = 3; - this.lblStoreSettingsInNHibernateConfigDescription.Text = "Store the database connection settings in nhibernate.config instead of the web.co" + - "nfig"; - this.lblStoreSettingsInNHibernateConfigDescription.Click += new System.EventHandler(this.lblStoreSettingsInNHibernateConfigDescription_Click); + this.wizardPageComplete.BackColor = System.Drawing.Color.White; + this.wizardPageComplete.Controls.Add(this.lnkViewLog); + this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle); + this.wizardPageComplete.Controls.Add(this.pictureBoxComplete); + this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription); + this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage); + this.wizardPageComplete.Controls.Add(this.txtErrorMessage); + this.wizardPageComplete.Controls.Add(this.lstLog); + this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardPageComplete.IsFinishPage = true; + this.wizardPageComplete.Location = new System.Drawing.Point(0, 0); + this.wizardPageComplete.Name = "wizardPageComplete"; + this.wizardPageComplete.Size = new System.Drawing.Size(525, 312); + this.wizardPageComplete.TabIndex = 7; + this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext); // - // lblAddMembershipSupportText + // lnkViewLog // - this.lblAddMembershipSupportText.Location = new System.Drawing.Point(47, 221); - this.lblAddMembershipSupportText.Name = "lblAddMembershipSupportText"; - this.lblAddMembershipSupportText.Size = new System.Drawing.Size(222, 30); - this.lblAddMembershipSupportText.TabIndex = 3; - this.lblAddMembershipSupportText.Text = "This options adds users and roles to the UML model and full ASP.NET Membership su" + - "pport to the solution."; - this.lblAddMembershipSupportText.Click += new System.EventHandler(this.lblAddMembershipSupportText_Click); + this.lnkViewLog.AutoSize = true; + this.lnkViewLog.Location = new System.Drawing.Point(210, 111); + this.lnkViewLog.Name = "lnkViewLog"; + this.lnkViewLog.Size = new System.Drawing.Size(49, 13); + this.lnkViewLog.TabIndex = 16; + this.lnkViewLog.TabStop = true; + this.lnkViewLog.Text = "View Log"; + this.lnkViewLog.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); // - // cbConfigureASPNETCartridge + // lblFinishPageTitle // - this.cbConfigureASPNETCartridge.AutoSize = true; - this.cbConfigureASPNETCartridge.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbConfigureASPNETCartridge.Location = new System.Drawing.Point(270, 254); - this.cbConfigureASPNETCartridge.Name = "cbConfigureASPNETCartridge"; - this.cbConfigureASPNETCartridge.Size = new System.Drawing.Size(137, 17); - this.cbConfigureASPNETCartridge.TabIndex = 2; - this.cbConfigureASPNETCartridge.Text = "Use ASP.NET Cartridge"; - this.cbConfigureASPNETCartridge.UseVisualStyleBackColor = true; - this.cbConfigureASPNETCartridge.CheckedChanged += new System.EventHandler(this.cbAddMembershipSupport_CheckedChanged); + this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.An... [truncated message content] |