Menu
▾
▴
andromdaplugins-cvs
|
From: Chris M. <cm...@us...> - 2006-05-29 14:56:18
|
User: cmicali
Date: 06/05/29 07:56:13
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
MDASolutionWizard.cs MDASolutionWizard.designer.cs
MDASolutionWizard.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
VSSolutionUtils.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
WizardSolutionProcessor.cs
Log:
- Clean up on the solution wizard UI
- Removed version number input field from the solution wizard UI
Revision Changes Path
1.7 +2 -5 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs
Index: MDASolutionWizard.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- MDASolutionWizard.cs 28 May 2006 15:49:55 -0000 1.6
+++ MDASolutionWizard.cs 29 May 2006 14:56:12 -0000 1.7
@@ -71,7 +71,6 @@
// Set sensible defaults
string solutionName = VSSolutionUtils.GetSolutionName(m_applicationObject.Solution);
txtApplicationName.Text = solutionName;
- txtApplicationVersion.Text = "1.0";
ddlVersionControl.SelectedIndex = 0;
usrCommonProject.ProjectName = solutionName + ".Common";
usrCoreProject.ProjectName = solutionName + ".Core";
@@ -113,7 +112,6 @@
private void wizardPageConfirmChoices_ShowFromNext(object sender, EventArgs e)
{
lblApplicationName.Text = txtApplicationName.Text;
- lblApplicationVersion.Text = txtApplicationVersion.Text;
lblDatabaseType.Text = ddlDatabaseType.SelectedItem.ToString();
lblCommonProject.Text = usrCommonProject.ProjectName;
lblCoreProject.Text = usrCoreProject.ProjectName;
@@ -191,8 +189,7 @@
private void wizardPageSolutionInfo_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e)
{
bool v1 = ValidationUtils.ValidateRequiredTextBox(txtApplicationName);
- bool v2 = ValidationUtils.ValidateRequiredTextBox(txtApplicationVersion);
- bool pageValid = v1 && v2;
+ bool pageValid = v1;
if (!pageValid)
{
e.Page = wizardPageSolutionInfo;
@@ -329,7 +326,7 @@
config["application.name"] = txtApplicationName.Text;
config["application.name.nospaces"] = txtApplicationName.Text.Replace(" ", string.Empty);
- config["application.version"] = txtApplicationVersion.Text;
+ config["application.version"] = "1.0";
config["application.versioncontrol"] = ddlVersionControl.SelectedItem.ToString();
config["application.model.filename"] = config["application.name.nospaces"] + ".Model.xml.zip";
1.5 +395 -442 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs
Index: MDASolutionWizard.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MDASolutionWizard.designer.cs 28 May 2006 15:49:55 -0000 1.4
+++ MDASolutionWizard.designer.cs 29 May 2006 14:56:12 -0000 1.5
@@ -32,45 +32,18 @@
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.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
- this.ddlVersionControl = new System.Windows.Forms.ComboBox();
- this.ddlDatabaseType = new System.Windows.Forms.ComboBox();
- this.label1 = new System.Windows.Forms.Label();
- this.txtApplicationVersion = new System.Windows.Forms.TextBox();
- this.label17 = new System.Windows.Forms.Label();
- this.label14 = 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.label9 = 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.lblFinishPageTitle = new System.Windows.Forms.Label();
- this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
- this.lblFinishPageDescription = new System.Windows.Forms.Label();
- this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
- this.txtErrorMessage = new System.Windows.Forms.TextBox();
- this.wizardPageProcessing = new Gui.Wizard.WizardPage();
- this.lstStatus = new System.Windows.Forms.ListBox();
- this.label7 = new System.Windows.Forms.Label();
- this.header5 = new Gui.Wizard.Header();
- this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
this.lblWebProject = new System.Windows.Forms.Label();
this.lblSchemaExportProject = new System.Windows.Forms.Label();
this.lblGenerateWebProject = new System.Windows.Forms.Label();
this.lblGenerateSchemaExportProject = new System.Windows.Forms.Label();
this.lblDatabaseType = new System.Windows.Forms.Label();
- this.lblApplicationVersion = new System.Windows.Forms.Label();
this.lblCoreProject = new System.Windows.Forms.Label();
this.lblApplicationName = new System.Windows.Forms.Label();
this.lblCommonProject = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
- this.label16 = new System.Windows.Forms.Label();
this.label19 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
@@ -78,9 +51,22 @@
this.label3 = new System.Windows.Forms.Label();
this.header4 = new Gui.Wizard.Header();
this.wizardPageWebProject = new Gui.Wizard.WizardPage();
+ this.rbWebConfig = new System.Windows.Forms.RadioButton();
+ this.rbNHibernateConfig = new System.Windows.Forms.RadioButton();
this.cbCreateWebProject = new System.Windows.Forms.CheckBox();
this.txtWebProject = new System.Windows.Forms.TextBox();
this.header7 = new Gui.Wizard.Header();
+ this.wizardPageProcessing = new Gui.Wizard.WizardPage();
+ this.lstStatus = new System.Windows.Forms.ListBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.header5 = new Gui.Wizard.Header();
+ this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
+ this.wizardPageComplete = new Gui.Wizard.WizardPage();
+ this.lblFinishPageTitle = new System.Windows.Forms.Label();
+ this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
+ this.lblFinishPageDescription = new System.Windows.Forms.Label();
+ this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
+ this.txtErrorMessage = new System.Windows.Forms.TextBox();
this.wizardPageSchemaExportProject = new Gui.Wizard.WizardPage();
this.cbCreateSchemaExport = new System.Windows.Forms.CheckBox();
this.txtSchemaExportProject = new System.Windows.Forms.TextBox();
@@ -92,22 +78,32 @@
this.wizardPageCommonProject = new Gui.Wizard.WizardPage();
this.usrCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
this.header1 = new Gui.Wizard.Header();
- this.rbNHibernateConfig = new System.Windows.Forms.RadioButton();
- this.rbWebConfig = new System.Windows.Forms.RadioButton();
+ this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
+ this.ddlVersionControl = new System.Windows.Forms.ComboBox();
+ this.ddlDatabaseType = new System.Windows.Forms.ComboBox();
+ 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.label9 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
this.wizard1.SuspendLayout();
- this.wizardPageSolutionInfo.SuspendLayout();
- this.wizardPageWelcome.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
- this.wizardPageComplete.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
+ this.wizardPageConfirmChoices.SuspendLayout();
+ this.wizardPageWebProject.SuspendLayout();
this.wizardPageProcessing.SuspendLayout();
this.header5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
- this.wizardPageConfirmChoices.SuspendLayout();
- this.wizardPageWebProject.SuspendLayout();
+ this.wizardPageComplete.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
this.wizardPageSchemaExportProject.SuspendLayout();
this.wizardPageCoreProject.SuspendLayout();
this.wizardPageCommonProject.SuspendLayout();
+ this.wizardPageSolutionInfo.SuspendLayout();
+ this.wizardPageWelcome.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
this.SuspendLayout();
//
// imageList1
@@ -120,6 +116,7 @@
// wizard1
//
this.wizard1.ContainingForm = null;
+ this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
this.wizard1.Controls.Add(this.wizardPageWebProject);
this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
this.wizard1.Controls.Add(this.wizardPageCoreProject);
@@ -128,7 +125,6 @@
this.wizard1.Controls.Add(this.wizardPageWelcome);
this.wizard1.Controls.Add(this.wizardPageComplete);
this.wizard1.Controls.Add(this.wizardPageProcessing);
- this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
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);
@@ -147,289 +143,6 @@
this.wizard1.TabIndex = 0;
this.wizard1.Load += new System.EventHandler(this.wizard1_Load);
//
- // wizardPageSolutionInfo
- //
- this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl);
- this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType);
- this.wizardPageSolutionInfo.Controls.Add(this.label1);
- this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationVersion);
- this.wizardPageSolutionInfo.Controls.Add(this.label17);
- this.wizardPageSolutionInfo.Controls.Add(this.label14);
- 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, 297);
- 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);
- //
- // ddlVersionControl
- //
- this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ddlVersionControl.FormattingEnabled = true;
- this.ddlVersionControl.Items.AddRange(new object[] {
- "None",
- "CVS",
- "Subversion"});
- this.ddlVersionControl.Location = new System.Drawing.Point(15, 234);
- this.ddlVersionControl.Name = "ddlVersionControl";
- this.ddlVersionControl.Size = new System.Drawing.Size(335, 21);
- this.ddlVersionControl.TabIndex = 7;
- //
- // ddlDatabaseType
- //
- this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ddlDatabaseType.FormattingEnabled = true;
- this.ddlDatabaseType.Items.AddRange(new object[] {
- "Microsoft SQL Server",
- "MySQL",
- "Oracle 9i",
- "Hypersonic"});
- this.ddlDatabaseType.Location = new System.Drawing.Point(15, 189);
- this.ddlDatabaseType.Name = "ddlDatabaseType";
- this.ddlDatabaseType.Size = new System.Drawing.Size(335, 21);
- this.ddlDatabaseType.TabIndex = 5;
- //
- // label1
- //
- 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(12, 214);
- 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?";
- //
- // txtApplicationVersion
- //
- this.txtApplicationVersion.Location = new System.Drawing.Point(15, 144);
- this.txtApplicationVersion.Name = "txtApplicationVersion";
- this.txtApplicationVersion.Size = new System.Drawing.Size(335, 21);
- this.txtApplicationVersion.TabIndex = 3;
- //
- // label17
- //
- 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(12, 169);
- 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?";
- //
- // label14
- //
- this.label14.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label14.Location = new System.Drawing.Point(12, 124);
- this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(507, 16);
- this.label14.TabIndex = 2;
- this.label14.Text = "What is the version number of your application? (Example: 1.1-Release)";
- //
- // txtApplicationName
- //
- this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window;
- this.txtApplicationName.Location = new System.Drawing.Point(15, 99);
- this.txtApplicationName.Name = "txtApplicationName";
- this.txtApplicationName.Size = new System.Drawing.Size(335, 21);
- this.txtApplicationName.TabIndex = 1;
- //
- // label12
- //
- 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(12, 79);
- 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)";
- //
- // header6
- //
- 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 = ((System.Drawing.Image)(resources.GetObject("header6.Image")));
- 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";
- //
- // wizardPageWelcome
- //
- this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
- this.wizardPageWelcome.Controls.Add(this.label9);
- 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, 297);
- this.wizardPageWelcome.TabIndex = 1;
- //
- // label9
- //
- this.label9.Location = new System.Drawing.Point(174, 61);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(339, 220);
- this.label9.TabIndex = 9;
- this.label9.Text = resources.GetString("label9.Text");
- //
- // label8
- //
- 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(170, 9);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(304, 48);
- this.label8.TabIndex = 8;
- this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
- //
- // pictureBoxWelcome
- //
- this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
- this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxWelcome.Name = "pictureBoxWelcome";
- this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
- this.pictureBoxWelcome.TabIndex = 1;
- this.pictureBoxWelcome.TabStop = false;
- //
- // wizardPageComplete
- //
- this.wizardPageComplete.BackColor = System.Drawing.Color.White;
- 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.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, 297);
- this.wizardPageComplete.TabIndex = 7;
- this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
- //
- // lblFinishPageTitle
- //
- 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;
- //
- // pictureBoxComplete
- //
- this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
- this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxComplete.Name = "pictureBoxComplete";
- this.pictureBoxComplete.Size = new System.Drawing.Size(164, 297);
- this.pictureBoxComplete.TabIndex = 13;
- this.pictureBoxComplete.TabStop = false;
- //
- // lblFinishPageDescription
- //
- this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
- this.lblFinishPageDescription.Name = "lblFinishPageDescription";
- this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 72);
- 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";
- //
- // lblFinishPageTitleImage
- //
- 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;
- //
- // txtErrorMessage
- //
- 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;
- //
- // wizardPageProcessing
- //
- 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, 297);
- this.wizardPageProcessing.TabIndex = 6;
- this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
- //
- // 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, 186);
- this.lstStatus.TabIndex = 9;
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(12, 77);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(273, 13);
- this.label7.TabIndex = 8;
- this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
- //
- // header5
- //
- this.header5.BackColor = System.Drawing.SystemColors.Control;
- this.header5.CausesValidation = false;
- this.header5.Controls.Add(this.pictureBoxThrobber);
- this.header5.Description = "Please wait...";
- this.header5.Dock = System.Windows.Forms.DockStyle.Top;
- this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
- 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";
- //
- // pictureBoxThrobber
- //
- this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
- this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
- this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
- this.pictureBoxThrobber.Name = "pictureBoxThrobber";
- this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
- this.pictureBoxThrobber.TabIndex = 10;
- this.pictureBoxThrobber.TabStop = false;
- //
// wizardPageConfirmChoices
//
this.wizardPageConfirmChoices.Controls.Add(this.lblWebProject);
@@ -437,14 +150,12 @@
this.wizardPageConfirmChoices.Controls.Add(this.lblGenerateWebProject);
this.wizardPageConfirmChoices.Controls.Add(this.lblGenerateSchemaExportProject);
this.wizardPageConfirmChoices.Controls.Add(this.lblDatabaseType);
- this.wizardPageConfirmChoices.Controls.Add(this.lblApplicationVersion);
this.wizardPageConfirmChoices.Controls.Add(this.lblCoreProject);
this.wizardPageConfirmChoices.Controls.Add(this.lblApplicationName);
this.wizardPageConfirmChoices.Controls.Add(this.lblCommonProject);
this.wizardPageConfirmChoices.Controls.Add(this.label20);
this.wizardPageConfirmChoices.Controls.Add(this.label6);
this.wizardPageConfirmChoices.Controls.Add(this.label18);
- this.wizardPageConfirmChoices.Controls.Add(this.label16);
this.wizardPageConfirmChoices.Controls.Add(this.label19);
this.wizardPageConfirmChoices.Controls.Add(this.label5);
this.wizardPageConfirmChoices.Controls.Add(this.label15);
@@ -462,7 +173,7 @@
// lblWebProject
//
this.lblWebProject.AutoSize = true;
- this.lblWebProject.Location = new System.Drawing.Point(245, 223);
+ this.lblWebProject.Location = new System.Drawing.Point(244, 233);
this.lblWebProject.Name = "lblWebProject";
this.lblWebProject.Size = new System.Drawing.Size(23, 13);
this.lblWebProject.TabIndex = 26;
@@ -471,7 +182,7 @@
// lblSchemaExportProject
//
this.lblSchemaExportProject.AutoSize = true;
- this.lblSchemaExportProject.Location = new System.Drawing.Point(245, 187);
+ this.lblSchemaExportProject.Location = new System.Drawing.Point(245, 189);
this.lblSchemaExportProject.Name = "lblSchemaExportProject";
this.lblSchemaExportProject.Size = new System.Drawing.Size(23, 13);
this.lblSchemaExportProject.TabIndex = 26;
@@ -480,7 +191,7 @@
// lblGenerateWebProject
//
this.lblGenerateWebProject.AutoSize = true;
- this.lblGenerateWebProject.Location = new System.Drawing.Point(245, 205);
+ this.lblGenerateWebProject.Location = new System.Drawing.Point(245, 211);
this.lblGenerateWebProject.Name = "lblGenerateWebProject";
this.lblGenerateWebProject.Size = new System.Drawing.Size(20, 13);
this.lblGenerateWebProject.TabIndex = 26;
@@ -489,7 +200,7 @@
// lblGenerateSchemaExportProject
//
this.lblGenerateSchemaExportProject.AutoSize = true;
- this.lblGenerateSchemaExportProject.Location = new System.Drawing.Point(245, 169);
+ this.lblGenerateSchemaExportProject.Location = new System.Drawing.Point(245, 167);
this.lblGenerateSchemaExportProject.Name = "lblGenerateSchemaExportProject";
this.lblGenerateSchemaExportProject.Size = new System.Drawing.Size(20, 13);
this.lblGenerateSchemaExportProject.TabIndex = 26;
@@ -498,25 +209,16 @@
// lblDatabaseType
//
this.lblDatabaseType.AutoSize = true;
- this.lblDatabaseType.Location = new System.Drawing.Point(245, 115);
+ this.lblDatabaseType.Location = new System.Drawing.Point(245, 101);
this.lblDatabaseType.Name = "lblDatabaseType";
this.lblDatabaseType.Size = new System.Drawing.Size(50, 13);
this.lblDatabaseType.TabIndex = 26;
this.lblDatabaseType.Text = "unknown";
//
- // lblApplicationVersion
- //
- this.lblApplicationVersion.AutoSize = true;
- this.lblApplicationVersion.Location = new System.Drawing.Point(245, 97);
- this.lblApplicationVersion.Name = "lblApplicationVersion";
- this.lblApplicationVersion.Size = new System.Drawing.Size(50, 13);
- this.lblApplicationVersion.TabIndex = 26;
- this.lblApplicationVersion.Text = "unknown";
- //
// lblCoreProject
//
this.lblCoreProject.AutoSize = true;
- this.lblCoreProject.Location = new System.Drawing.Point(245, 151);
+ this.lblCoreProject.Location = new System.Drawing.Point(245, 145);
this.lblCoreProject.Name = "lblCoreProject";
this.lblCoreProject.Size = new System.Drawing.Size(28, 13);
this.lblCoreProject.TabIndex = 26;
@@ -534,7 +236,7 @@
// lblCommonProject
//
this.lblCommonProject.AutoSize = true;
- this.lblCommonProject.Location = new System.Drawing.Point(245, 133);
+ this.lblCommonProject.Location = new System.Drawing.Point(245, 123);
this.lblCommonProject.Name = "lblCommonProject";
this.lblCommonProject.Size = new System.Drawing.Size(46, 13);
this.lblCommonProject.TabIndex = 26;
@@ -544,7 +246,7 @@
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label20.Location = new System.Drawing.Point(160, 223);
+ this.label20.Location = new System.Drawing.Point(159, 233);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(79, 13);
this.label20.TabIndex = 25;
@@ -554,7 +256,7 @@
//
this.label6.AutoSize = true;
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(100, 187);
+ this.label6.Location = new System.Drawing.Point(100, 189);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(139, 13);
this.label6.TabIndex = 25;
@@ -564,27 +266,17 @@
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label18.Location = new System.Drawing.Point(144, 115);
+ this.label18.Location = new System.Drawing.Point(144, 101);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(95, 13);
this.label18.TabIndex = 25;
this.label18.Text = "Database Type:";
//
- // label16
- //
- this.label16.AutoSize = true;
- this.label16.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label16.Location = new System.Drawing.Point(121, 97);
- this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(118, 13);
- this.label16.TabIndex = 25;
- this.label16.Text = "Application Version:";
- //
// label19
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label19.Location = new System.Drawing.Point(104, 205);
+ this.label19.Location = new System.Drawing.Point(104, 211);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(135, 13);
this.label19.TabIndex = 25;
@@ -594,7 +286,7 @@
//
this.label5.AutoSize = true;
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(44, 169);
+ this.label5.Location = new System.Drawing.Point(44, 167);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(195, 13);
this.label5.TabIndex = 25;
@@ -614,7 +306,7 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label4.Location = new System.Drawing.Point(159, 151);
+ this.label4.Location = new System.Drawing.Point(159, 145);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(80, 13);
this.label4.TabIndex = 25;
@@ -624,7 +316,7 @@
//
this.label3.AutoSize = true;
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(135, 133);
+ this.label3.Location = new System.Drawing.Point(135, 123);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(104, 13);
this.label3.TabIndex = 25;
@@ -644,56 +336,206 @@
this.header4.TabIndex = 5;
this.header4.Title = "Confirm Choices";
//
- // wizardPageWebProject
+ // wizardPageWebProject
+ //
+ this.wizardPageWebProject.Controls.Add(this.rbWebConfig);
+ this.wizardPageWebProject.Controls.Add(this.rbNHibernateConfig);
+ this.wizardPageWebProject.Controls.Add(this.cbCreateWebProject);
+ this.wizardPageWebProject.Controls.Add(this.txtWebProject);
+ 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, 297);
+ this.wizardPageWebProject.TabIndex = 9;
+ this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
+ this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
+ //
+ // rbWebConfig
+ //
+ this.rbWebConfig.AutoSize = true;
+ this.rbWebConfig.Location = new System.Drawing.Point(30, 149);
+ this.rbWebConfig.Name = "rbWebConfig";
+ this.rbWebConfig.Size = new System.Drawing.Size(217, 17);
+ this.rbWebConfig.TabIndex = 29;
+ this.rbWebConfig.Text = "Store persistance settings in web.config";
+ this.rbWebConfig.UseVisualStyleBackColor = true;
+ //
+ // rbNHibernateConfig
+ //
+ this.rbNHibernateConfig.AutoSize = true;
+ this.rbNHibernateConfig.Checked = true;
+ this.rbNHibernateConfig.Location = new System.Drawing.Point(30, 126);
+ this.rbNHibernateConfig.Name = "rbNHibernateConfig";
+ this.rbNHibernateConfig.Size = new System.Drawing.Size(249, 17);
+ this.rbNHibernateConfig.TabIndex = 28;
+ this.rbNHibernateConfig.TabStop = true;
+ this.rbNHibernateConfig.Text = "Store persistance settings in nhibernate.config";
+ this.rbNHibernateConfig.UseVisualStyleBackColor = true;
+ //
+ // cbCreateWebProject
+ //
+ this.cbCreateWebProject.AutoSize = true;
+ this.cbCreateWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbCreateWebProject.Location = new System.Drawing.Point(11, 79);
+ this.cbCreateWebProject.Name = "cbCreateWebProject";
+ this.cbCreateWebProject.Size = new System.Drawing.Size(134, 17);
+ this.cbCreateWebProject.TabIndex = 25;
+ this.cbCreateWebProject.Text = "Create web project";
+ this.cbCreateWebProject.UseVisualStyleBackColor = true;
+ this.cbCreateWebProject.CheckedChanged += new System.EventHandler(this.cbCreateWebProject_CheckedChanged);
+ //
+ // txtWebProject
+ //
+ this.txtWebProject.Enabled = false;
+ this.txtWebProject.Location = new System.Drawing.Point(30, 99);
+ this.txtWebProject.Name = "txtWebProject";
+ this.txtWebProject.Size = new System.Drawing.Size(320, 21);
+ this.txtWebProject.TabIndex = 26;
+ this.txtWebProject.Text = "Web";
+ //
+ // header7
+ //
+ this.header7.BackColor = System.Drawing.SystemColors.Control;
+ this.header7.CausesValidation = false;
+ this.header7.Description = "Check the box below if you would like to create a web site project that is config" +
+ "ured to work with NHibernate and your generated objects.";
+ this.header7.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header7.Image = ((System.Drawing.Image)(resources.GetObject("header7.Image")));
+ this.header7.Location = new System.Drawing.Point(0, 0);
+ this.header7.Name = "header7";
+ this.header7.Size = new System.Drawing.Size(525, 65);
+ this.header7.TabIndex = 27;
+ this.header7.Title = "Web Project";
+ //
+ // wizardPageProcessing
+ //
+ 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, 297);
+ this.wizardPageProcessing.TabIndex = 6;
+ this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
+ //
+ // 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, 186);
+ this.lstStatus.TabIndex = 9;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(12, 77);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(273, 13);
+ this.label7.TabIndex = 8;
+ this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
+ //
+ // header5
+ //
+ this.header5.BackColor = System.Drawing.SystemColors.Control;
+ this.header5.CausesValidation = false;
+ this.header5.Controls.Add(this.pictureBoxThrobber);
+ this.header5.Description = "Please wait...";
+ this.header5.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
+ 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";
+ //
+ // pictureBoxThrobber
+ //
+ this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
+ this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
+ this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
+ this.pictureBoxThrobber.Name = "pictureBoxThrobber";
+ this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
+ this.pictureBoxThrobber.TabIndex = 10;
+ this.pictureBoxThrobber.TabStop = false;
+ //
+ // wizardPageComplete
+ //
+ this.wizardPageComplete.BackColor = System.Drawing.Color.White;
+ 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.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, 297);
+ this.wizardPageComplete.TabIndex = 7;
+ this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
+ //
+ // lblFinishPageTitle
+ //
+ 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;
+ //
+ // pictureBoxComplete
//
- this.wizardPageWebProject.Controls.Add(this.rbWebConfig);
- this.wizardPageWebProject.Controls.Add(this.rbNHibernateConfig);
- this.wizardPageWebProject.Controls.Add(this.cbCreateWebProject);
- this.wizardPageWebProject.Controls.Add(this.txtWebProject);
- 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, 297);
- this.wizardPageWebProject.TabIndex = 9;
- this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
- this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
+ this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
+ this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxComplete.Name = "pictureBoxComplete";
+ this.pictureBoxComplete.Size = new System.Drawing.Size(164, 297);
+ this.pictureBoxComplete.TabIndex = 13;
+ this.pictureBoxComplete.TabStop = false;
//
- // cbCreateWebProject
+ // lblFinishPageDescription
//
- this.cbCreateWebProject.AutoSize = true;
- this.cbCreateWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbCreateWebProject.Location = new System.Drawing.Point(11, 79);
- this.cbCreateWebProject.Name = "cbCreateWebProject";
- this.cbCreateWebProject.Size = new System.Drawing.Size(134, 17);
- this.cbCreateWebProject.TabIndex = 25;
- this.cbCreateWebProject.Text = "Create web project";
- this.cbCreateWebProject.UseVisualStyleBackColor = true;
- this.cbCreateWebProject.CheckedChanged += new System.EventHandler(this.cbCreateWebProject_CheckedChanged);
+ this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
+ this.lblFinishPageDescription.Name = "lblFinishPageDescription";
+ this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 72);
+ 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";
//
- // txtWebProject
+ // lblFinishPageTitleImage
//
- this.txtWebProject.Enabled = false;
- this.txtWebProject.Location = new System.Drawing.Point(30, 99);
- this.txtWebProject.Name = "txtWebProject";
- this.txtWebProject.Size = new System.Drawing.Size(320, 21);
- this.txtWebProject.TabIndex = 26;
- this.txtWebProject.Text = "Web";
+ 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;
//
- // header7
+ // txtErrorMessage
//
- this.header7.BackColor = System.Drawing.SystemColors.Control;
- this.header7.CausesValidation = false;
- this.header7.Description = "Check the box below if you would like to create a web site project that is config" +
- "ured to work with NHibernate and your generated objects.";
- this.header7.Dock = System.Windows.Forms.DockStyle.Top;
- this.header7.Image = ((System.Drawing.Image)(resources.GetObject("header7.Image")));
- this.header7.Location = new System.Drawing.Point(0, 0);
- this.header7.Name = "header7";
- this.header7.Size = new System.Drawing.Size(525, 65);
- this.header7.TabIndex = 27;
- this.header7.Title = "Web Project";
+ 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;
//
// wizardPageSchemaExportProject
//
@@ -823,27 +665,142 @@
this.header1.TabIndex = 0;
this.header1.Title = "Common Project";
//
- // rbNHibernateConfig
+ // wizardPageSolutionInfo
//
- this.rbNHibernateConfig.AutoSize = true;
- this.rbNHibernateConfig.Checked = true;
- this.rbNHibernateConfig.Location = new System.Drawing.Point(30, 126);
- this.rbNHibernateConfig.Name = "rbNHibernateConfig";
- this.rbNHibernateConfig.Size = new System.Drawing.Size(249, 17);
- this.rbNHibernateConfig.TabIndex = 28;
- this.rbNHibernateConfig.TabStop = true;
- this.rbNHibernateConfig.Text = "Store persistance settings in nhibernate.config";
- this.rbNHibernateConfig.UseVisualStyleBackColor = true;
+ this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl);
+ this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType);
+ 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, 297);
+ 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);
//
- // rbWebConfig
+ // ddlVersionControl
//
- this.rbWebConfig.AutoSize = true;
- this.rbWebConfig.Location = new System.Drawing.Point(30, 149);
- this.rbWebConfig.Name = "rbWebConfig";
- this.rbWebConfig.Size = new System.Drawing.Size(217, 17);
- this.rbWebConfig.TabIndex = 29;
- this.rbWebConfig.Text = "Store persistance settings in web.config";
- this.rbWebConfig.UseVisualStyleBackColor = true;
+ this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.ddlVersionControl.FormattingEnabled = true;
+ this.ddlVersionControl.Items.AddRange(new object[] {
+ "None",
+ "CVS",
+ "Subversion"});
+ this.ddlVersionControl.Location = new System.Drawing.Point(12, 226);
+ this.ddlVersionControl.Name = "ddlVersionControl";
+ this.ddlVersionControl.Size = new System.Drawing.Size(335, 21);
+ this.ddlVersionControl.TabIndex = 7;
+ //
+ // ddlDatabaseType
+ //
+ this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.ddlDatabaseType.FormattingEnabled = true;
+ this.ddlDatabaseType.Items.AddRange(new object[] {
+ "Microsoft SQL Server",
+ "MySQL",
+ "Oracle 9i",
+ "Hypersonic"});
+ this.ddlDatabaseType.Location = new System.Drawing.Point(12, 167);
+ this.ddlDatabaseType.Name = "ddlDatabaseType";
+ this.ddlDatabaseType.Size = new System.Drawing.Size(335, 21);
+ this.ddlDatabaseType.TabIndex = 5;
+ //
+ // label1
+ //
+ 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, 199);
+ 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?";
+ //
+ // label17
+ //
+ 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, 140);
+ 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?";
+ //
+ // txtApplicationName
+ //
+ this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window;
+ this.txtApplicationName.Location = new System.Drawing.Point(12, 108);
+ this.txtApplicationName.Name = "txtApplicationName";
+ this.txtApplicationName.Size = new System.Drawing.Size(335, 21);
+ this.txtApplicationName.TabIndex = 1;
+ //
+ // label12
+ //
+ 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)";
+ //
+ // header6
+ //
+ 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 = ((System.Drawing.Image)(resources.GetObject("header6.Image")));
+ 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";
+ //
+ // wizardPageWelcome
+ //
+ this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
+ this.wizardPageWelcome.Controls.Add(this.label9);
+ 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, 297);
+ this.wizardPageWelcome.TabIndex = 1;
+ //
+ // label9
+ //
+ this.label9.Location = new System.Drawing.Point(174, 61);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(339, 220);
+ this.label9.TabIndex = 9;
+ this.label9.Text = resources.GetString("label9.Text");
+ //
+ // label8
+ //
+ 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(170, 9);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(304, 48);
+ this.label8.TabIndex = 8;
+ this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
+ //
+ // pictureBoxWelcome
+ //
+ this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
+ this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxWelcome.Name = "pictureBoxWelcome";
+ this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
+ this.pictureBoxWelcome.TabIndex = 1;
+ this.pictureBoxWelcome.TabStop = false;
//
// MDASolutionWizard
//
@@ -860,25 +817,25 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "AndroMDA Solution Wizard";
this.wizard1.ResumeLayout(false);
- this.wizardPageSolutionInfo.ResumeLayout(false);
- this.wizardPageSolutionInfo.PerformLayout();
- this.wizardPageWelcome.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
- this.wizardPageComplete.ResumeLayout(false);
- this.wizardPageComplete.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).EndInit();
- this.wizardPageProcessing.ResumeLayout(false);
- this.wizardPageProcessing.PerformLayout();
- this.header5.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).EndInit();
this.wizardPageConfirmChoices.ResumeLayout(false);
this.wizardPageConfirmChoices.PerformLayout();
this.wizardPageWebProject.ResumeLayout(false);
this.wizardPageWebProject.PerformLayout();
+ this.wizardPageProcessing.ResumeLayout(false);
+ this.wizardPageProcessing.PerformLayout();
+ this.header5.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).EndInit();
+ this.wizardPageComplete.ResumeLayout(false);
+ this.wizardPageComplete.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).EndInit();
this.wizardPageSchemaExportProject.ResumeLayout(false);
this.wizardPageSchemaExportProject.PerformLayout();
this.wizardPageCoreProject.ResumeLayout(false);
this.wizardPageCommonProject.ResumeLayout(false);
+ this.wizardPageSolutionInfo.ResumeLayout(false);
+ this.wizardPageSolutionInfo.PerformLayout();
+ this.wizardPageWelcome.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
this.ResumeLayout(false);
}
@@ -922,11 +879,7 @@
private System.Windows.Forms.TextBox txtApplicationName;
private System.Windows.Forms.Label label12;
private Gui.Wizard.Header header6;
- private System.Windows.Forms.TextBox txtApplicationVersion;
- private System.Windows.Forms.Label label14;
- private System.Windows.Forms.Label lblApplicationVersion;
private System.Windows.Forms.Label lblApplicationName;
- private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.ComboBox ddlDatabaseType;
private System.Windows.Forms.Label label17;
1.5 +442 -442 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.resx
Index: MDASolutionWizard.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.resx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MDASolutionWizard.resx 28 May 2006 15:49:55 -0000 1.4
+++ MDASolutionWizard.resx 29 May 2006 14:56:12 -0000 1.5
@@ -261,7 +261,7 @@
</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="header7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="header4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAgEASABIAAD/4QadRXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAcAAAAcgEyAA...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2007-08-07 02:29:39
|
User: cmicali
Date: 07/08/06 19:29:41
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven
Maven2Proxy.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
WizardSolutionProcessor.cs
Log:
- Fixed crash in Maven2Proxy.cs when maven reported incorrect download progress
- Added NHibernateTypeMappings to the AndroMDA solution folder in the solution wizard
- Cleaned up andromda.xml
Revision Changes Path
1.6 +1 -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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- Maven2Proxy.cs 3 Aug 2007 14:45:49 -0000 1.5
+++ Maven2Proxy.cs 7 Aug 2007 02:29:41 -0000 1.6
@@ -50,7 +50,7 @@
{
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";
+ if (current > total) total = current;
OutputWindow.DTE.StatusBar.Progress(true, "AndroMDA: Maven: Downloading file... " + text, current, total);
cancelOutput = true;
}
1.19 +1 -0 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.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- WizardSolutionProcessor.cs 3 Aug 2007 14:45:49 -0000 1.18
+++ WizardSolutionProcessor.cs 7 Aug 2007 02:29:41 -0000 1.19
@@ -219,6 +219,7 @@
}
solutionFolder.ProjectItems.AddFromFile(m_dstPath + "mda\\conf\\andromda.xml");
solutionFolder.ProjectItems.AddFromFile(m_dstPath + "mda\\conf\\mappings\\MergeMappings.xml");
+ solutionFolder.ProjectItems.AddFromFile(m_dstPath + "mda\\conf\\mappings\\NHibernateTypeMappings.xml");
//solutionFolder.ProjectItems.AddFromFile(m_dstPath + "mda\\src\\uml\\" + m_configuration["application.model.filename"]);
}
catch { }
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X