Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA VS2005 Add-In Setup.exe
|
From: Chris M. <cm...@us...> - 2006-05-03 20:23:14
|
User: cmicali
Date: 06/05/03 13:23:06
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs MDASolutionManager.cs
MavenProxy.cs WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
RunSchemaExportCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AboutDialog.cs AboutDialog.designer.cs
AboutOptionsPage.cs AboutOptionsPage.designer.cs
AboutOptionsPage.resx ExternalToolsOptionsPage.cs
ExternalToolsOptionsPage.designer.cs
ExternalToolsOptionsPage.resx
GeneralOptionsPage.Designer.cs
GeneralOptionsPage.cs MDASolutionWizard.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
AsyncOperation.cs VSExternalToolProxy.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Log:
- Cleaned up about dialog
- Removed maven path option since it is no longer used (MAVEN_HOME variable i used instead)
- Updated WizardSolutionProcessor to use AsyncOperation instead of a custom thread
- Added some comments
Revision Changes Path
No revision
No revision
No revision
No revision
1.4 +21 -53 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AddInSettings.cs
Index: AddInSettings.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AddInSettings.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AddInSettings.cs 2 May 2006 04:47:10 -0000 1.3
+++ AddInSettings.cs 3 May 2006 20:23:05 -0000 1.4
@@ -31,6 +31,8 @@
#endregion
+ #region Constructors
+
public AddInSettings(DTE applicationObject)
{
m_applicationObject = applicationObject;
@@ -41,15 +43,6 @@
FirstRun = false;
AddInBuild = ADDIN_SETTINGS_VERSION;
ResyncIgnoreList = "CVS;.cvsignore;.svn;.svnignore";
- string mavenHome = System.Environment.GetEnvironmentVariable("MAVEN_HOME");
- if (mavenHome != string.Empty)
- {
- MavenExecutablePath = mavenHome + "\\bin\\maven.bat";
- }
- else
- {
- MavenExecutablePath = "maven.bat";
- }
MavenUseOfflineMode = true;
MavenCleanFirst = true;
MavenUseCustomCommandLine = false;
@@ -60,6 +53,8 @@
}
}
+ #endregion
+
#region General settings
public bool FirstRun
@@ -107,12 +102,6 @@
#region Maven settings
- public string MavenExecutablePath
- {
- get { return m_settings["AMDAMavenPath"]; }
- set { m_settings["AMDAMavenPath"] = value; }
- }
-
public bool MavenUseOfflineMode
{
get { return m_settings.GetBool("AMDAMavenOffln"); }
@@ -207,44 +196,21 @@
set { m_settings.SetBool("ADMAShowSCEX", value); }
}
- /*
- private string GetCommandSetting(AddInCommandBase command, string setting)
- {
- setting = "AMDAC" + command.Name + setting;
- return m_settings.GetSetting(setting);
- }
-
- private void SetCommandSetting(AddInCommandBase command, string setting, string value)
- {
- setting = "AMDAC" + command.Name + setting;
- m_settings.SetSetting(setting, value);
- }
-
- public bool GetCommandIsVisible(AddInCommandBase command)
- {
- string setting = GetCommandSetting(command, "Vs");
- if (setting == string.Empty)
- {
- return true;
- }
- else
+ public bool HideSchemaExportButtonIfProjectUnavailable
{
- return bool.Parse(setting);
- }
+ get { return m_settings.GetBool("ADMAHideSCEX", true); }
+ set { m_settings.SetBool("ADMAHideSCEX", value); }
}
- public void SetCommandIsVisible(AddInCommandBase command, bool value)
- {
- SetCommandSetting(command, "Vs", value.ToString());
- }
- */
-
#endregion
+ #region Helper methods
+
public bool IsInIgnoreList(string file)
{
return IsInIgnoreList(file, true);
}
+
public bool IsInIgnoreList(string file, bool stripPath)
{
// Get the list of files to ignore
@@ -260,5 +226,7 @@
return false;
}
+ #endregion
+
}
}
1.5 +36 -17 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDASolutionManager.cs
Index: MDASolutionManager.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDASolutionManager.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MDASolutionManager.cs 2 May 2006 21:33:42 -0000 1.4
+++ MDASolutionManager.cs 3 May 2006 20:23:05 -0000 1.5
@@ -39,6 +39,7 @@
private MDAProject m_coreProject = null;
private MDAProject m_commonProject = null;
+ private MDAProject m_schemaExportProject = null;
private bool m_restartBuild = false;
private Mutex m_restartBuildMutex = new Mutex(false);
@@ -78,6 +79,11 @@
get { return m_commonProject; }
}
+ public MDAProject SchemaExportProject
+ {
+ get { return m_schemaExportProject; }
+ }
+
public bool IsEnabled
{
get { return m_enabled && m_applicationObject.Solution.IsOpen; }
@@ -148,6 +154,14 @@
}
}
+ public bool IsSchemaExportProjectAvailable
+ {
+ get
+ {
+ return m_projectProperties["maven.andromda.schemaexport.available"].ToLower().Trim() == "true";
+ }
+ }
+
#endregion
public MDASolutionManager(DTE applicationObject, AddInSettings addInSettings)
@@ -183,6 +197,7 @@
m_coreProject = null;
m_commonProject = null;
+ m_schemaExportProject = null;
// Iterate through the projects and search for the core and common directories
foreach (Project p in m_applicationObject.Solution.Projects)
@@ -209,6 +224,14 @@
string generatedPath = m_projectProperties.GetPath("maven.andromda.common.generated.dir");
m_commonProject = new MDAProject(p, FileUtils.GetFilename(projectPath), projectPath, generatedPath, string.Empty);
}
+
+ // Check if the current (schemaexport) directory is the same as the project directory
+ if (IsSchemaExportProjectAvailable && FileUtils.CompareDirectories(projectPath, m_projectProperties.GetPath("maven.andromda.schemaexport.dir")))
+ {
+ // if so this is the common project
+ m_schemaExportProject = new MDAProject(p, FileUtils.GetFilename(projectPath), projectPath, string.Empty, string.Empty);
+ }
+
}
catch (NotImplementedException)
{
@@ -286,26 +309,22 @@
{
try
{
- if (m_projectProperties["maven.andromda.schemaexport.available"].ToLower().Trim() == "true")
+ if (IsSchemaExportProjectAvailable && m_schemaExportProject != null)
{
- string schemaExportProjectPath = FileUtils.CleanDirectory(m_projectProperties["maven.andromda.schemaexport.dir"]);
string solutionName = VSSolutionUtils.GetSolutionName(m_applicationObject.Solution);
- Project schemaExportProject = VSSolutionUtils.FindProjectByDirectory(schemaExportProjectPath, m_applicationObject.Solution);
- if (schemaExportProject != null)
- {
- string schamaExportName = FileUtils.GetFilename(schemaExportProject.FileName).Replace(".csproj", string.Empty);
// Activate the solution explorer window
m_applicationObject.Windows.Item(Constants.vsWindowKindSolutionExplorer).Activate();
// Grab the UIHierarchy object for the schema export project
- UIHierarchyItem item = ((UIHierarchy)m_applicationObject.ActiveWindow.Object).GetItem(solutionName + "\\" + schamaExportName);
+ UIHierarchyItem item = ((UIHierarchy)m_applicationObject.ActiveWindow.Object).GetItem(solutionName + "\\" + m_schemaExportProject.Name);
// Select the project
item.Select(vsUISelectionType.vsUISelectionTypeSelect);
// Execute the Debug.StartNewInstance command
m_applicationObject.ExecuteCommand("ClassViewContextMenus.ClassViewProject.Debug.Startnewinstance", string.Empty);
- return;
}
+ else
+ {
+ AddInUtils.ShowWarning("The schema export project for this solution could not be found.\nPlease ensure the following variables are set correctly in mda\\project.properties\n\nmaven.andromda.schemaexport.available: true\nmaven.andromda.schemaexport.dir: <path to schema export project>");
}
- AddInUtils.ShowWarning("The schema export for this project could not be found.\nPlease ensure the following variables are set correctly in mda\\project.properties\n\nmaven.andromda.schemaexport.available: true\nmaven.andromda.schemaexport.dir: <path to schema export project>");
}
catch (Exception e)
{
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MavenProxy.cs
Index: MavenProxy.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MavenProxy.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MavenProxy.cs 28 Apr 2006 04:40:37 -0000 1.2
+++ MavenProxy.cs 3 May 2006 20:23:05 -0000 1.3
@@ -106,7 +106,7 @@
this.OutputWindowPane.Clear();
this.OutputWindowPane.Activate();
- this.ExecutablePath = m_addInSettings.MavenExecutablePath;
+ //this.ExecutablePath = m_addInSettings.MavenExecutablePath;
if (m_addInSettings.MavenUseCustomCommandLine)
{
1.2 +81 -48 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- WizardSolutionProcessor.cs 2 May 2006 04:47:10 -0000 1.1
+++ WizardSolutionProcessor.cs 3 May 2006 20:23:05 -0000 1.2
@@ -6,8 +6,8 @@
using System;
using System.IO;
-using System.Collections.Generic;
using System.Text;
+using System.ComponentModel;
using System.Threading;
using EnvDTE;
@@ -21,13 +21,16 @@
namespace AndroMDA.VS80AddIn
{
- public class WizardSolutionProcessor
+ /// <summary>
+ /// This class will process an existing solution and add
+ /// AndroMDA support. This is used solely by the MDA Solution Wizard.
+ /// </summary>
+ public class WizardSolutionProcessor : AsyncOperation
{
#region Member variables
private DTE m_applicationObject = null;
- private System.Threading.Thread m_thread = null;
public delegate void SolutionProcessingCompleteHandler(bool success, string errorMessage);
public delegate void SolutionProcessingStatusHandler(string status);
@@ -39,36 +42,27 @@
#endregion
- public WizardSolutionProcessor(ConfigFile config, DTE applicationObject)
+ #region Constructors
+
+ public WizardSolutionProcessor(ConfigFile config, DTE applicationObject) : base()
{
m_configuration = config;
m_applicationObject = applicationObject;
}
- private void AddToStatus(string message)
- {
- if (OnSolutionProcessingStatus != null)
- {
- if (OnSolutionProcessingStatus.Target is System.Windows.Forms.Control)
+ public WizardSolutionProcessor(ISynchronizeInvoke target, ConfigFile config, DTE applicationObject) : base(target)
{
- System.Windows.Forms.Control target = OnSolutionProcessingStatus.Target as System.Windows.Forms.Control;
- target.BeginInvoke(OnSolutionProcessingStatus, new Object[] { message });
- }
- else
- {
- OnSolutionProcessingStatus(message);
- }
- }
- System.Threading.Thread.Sleep(100);
+ m_configuration = config;
+ m_applicationObject = applicationObject;
}
- public void EnableSolutionForMDA()
- {
- m_thread = new System.Threading.Thread(new ThreadStart(this.UpdateSolutionThread));
- m_thread.Start();
- }
+ #endregion
- private void UpdateSolutionThread()
+ /// <summary>
+ /// The base class calls this method on a worker
+ /// thread when the Start method is called.
+ /// </summary>
+ protected override void DoWork()
{
bool success = false;
string errorMessage = string.Empty;
@@ -83,23 +77,13 @@
}
finally
{
- // Fire the processing complete event
- if (OnSolutionProcessingComplete != null)
- {
- if (OnSolutionProcessingComplete.Target is System.Windows.Forms.Control)
- {
- System.Windows.Forms.Control target = OnSolutionProcessingComplete.Target as System.Windows.Forms.Control;
- target.BeginInvoke(OnSolutionProcessingComplete, new Object[] { success, errorMessage });
- }
- else
- {
- OnSolutionProcessingComplete(success, errorMessage);
- }
- }
+ FireAsync(OnSolutionProcessingComplete, new Object[] { success, errorMessage });
}
}
-
+ /// <summary>
+ /// The actually processing happens in this method
+ /// </summary>
private void UpdateSolution()
{
string basePath = m_configuration["solution.path"];
@@ -120,6 +104,7 @@
AddToStatus("Using existing common project " + m_configuration["projects.common.name"] + "...");
commonProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.common.name"], m_applicationObject.Solution);
}
+
//CreateDirectory(basePath + "\\" + m_configuration["projects.common.dir"] + "\\src");
//CreateDirectory(basePath + "\\" + m_configuration["projects.common.dir"] + "\\target");
commonProject.ProjectItems.AddFolder("src", Constants.vsProjectItemKindPhysicalFolder);
@@ -228,15 +213,37 @@
}
+ #region Helper methods
+
+ /// <summary>
+ /// Adds a line of text to the status window
+ /// </summary>
+ /// <param name="message">The message.</param>
+ private void AddToStatus(string message)
+ {
+ FireAsync(OnSolutionProcessingStatus, new Object[] { message });
+ System.Threading.Thread.Sleep(0);
+ }
+
+ /// <summary>
+ /// Adds a project reference to a project in the solution
+ /// </summary>
+ /// <param name="destination">The destination project.</param>
+ /// <param name="projectToReference">The project to reference.</param>
private void AddProjectReference(Project destination, Project projectToReference)
{
VSProject proj = destination.Object as VSProject;
proj.References.AddProject(projectToReference);
}
- private void AddBinaryReferences(Project p, string basePath)
+ /// <summary>
+ /// Adds a binary reference to a project in the solution.
+ /// </summary>
+ /// <param name="p">The destination project</param>
+ /// <param name="basePath">The base path.</param>
+ private void AddBinaryReferences(Project destination, string basePath)
{
- VSProject proj = p.Object as VSProject;
+ VSProject proj = destination.Object as VSProject;
proj.References.Add(basePath + "\\Lib\\AndroMDA.NHibernateSupport.dll");
proj.References.Add(basePath + "\\Lib\\Castle.DynamicProxy.dll");
proj.References.Add(basePath + "\\Lib\\HashCodeProvider.dll");
@@ -247,6 +254,10 @@
proj.References.Add(basePath + "\\Lib\\NHibernate.Nullables2.dll");
}
+ /// <summary>
+ /// Creates a directory
+ /// </summary>
+ /// <param name="directoryName">Name of the directory.</param>
private void CreateDirectory(string directoryName)
{
if (System.IO.Directory.Exists(directoryName))
@@ -267,6 +278,11 @@
}
}
+ /// <summary>
+ /// Parses and resolves all variables in a string
+ /// </summary>
+ /// <param name="content">The string to parse.</param>
+ /// <returns></returns>
private string ParseVariables(string content)
{
foreach (string key in m_configuration.Keys)
@@ -280,6 +296,11 @@
return content;
}
+ /// <summary>
+ /// Writes a file to disk. This will call ParseVariables() on the content.
+ /// </summary>
+ /// <param name="filePath">The file to which to write.</param>
+ /// <param name="fileContent">The content to write to the file.</param>
private void WriteFile(string filePath, string fileContent)
{
if (System.IO.File.Exists(filePath))
@@ -295,6 +316,12 @@
sw.Close();
}
+ /// <summary>
+ /// Writes content to a file into a ZIP file
+ /// </summary>
+ /// <param name="fileNameInZip">The file name in zip.</param>
+ /// <param name="destinationFile">The destination zip file.</param>
+ /// <param name="fileContent">Content of the file.</param>
private void WriteCompressedFile(string fileNameInZip, string destinationFile, string fileContent)
{
if (System.IO.File.Exists(destinationFile))
@@ -328,6 +355,11 @@
zip.Close();
}
+ /// <summary>
+ /// Writes a binary file to disk.
+ /// </summary>
+ /// <param name="filePath">The file to which to write.</param>
+ /// <param name="fileContent">The content to write to the file.</param>
private void WriteFile(string filePath, Byte[] fileContent)
{
if (System.IO.File.Exists(filePath))
@@ -343,6 +375,7 @@
fs.Close();
}
+ #endregion
}
}
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSchemaExportCommand.cs
Index: RunSchemaExportCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSchemaExportCommand.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- RunSchemaExportCommand.cs 2 May 2006 21:33:43 -0000 1.2
+++ RunSchemaExportCommand.cs 3 May 2006 20:23:05 -0000 1.3
@@ -40,7 +40,7 @@
public override void QueryStatus(string commandName, vsCommandStatusTextWanted neededText, ref vsCommandStatus status, ref object commandText)
{
base.QueryStatus(commandName, neededText, ref status, ref commandText);
- if (!m_addInSettings.ShowSchemaExportButton)
+ if (!m_addInSettings.ShowSchemaExportButton || (!m_solutionManager.IsSchemaExportProjectAvailable && m_addInSettings.HideSchemaExportButtonIfProjectUnavailable))
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusInvisible;
}
1.2 +28 -16 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.cs
Index: AboutDialog.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- AboutDialog.cs 18 Apr 2006 16:14:44 -0000 1.1
+++ AboutDialog.cs 3 May 2006 20:23:06 -0000 1.2
@@ -18,14 +18,23 @@
{
public partial class AboutDialog : Form
{
+
+ #region Member variables
+
private MDASolutionManager m_solutionManager;
+ #endregion
+
+ #region Properties
+
public MDASolutionManager MDASolutionManager
{
get { return m_solutionManager; }
set { m_solutionManager = value; }
}
+ #endregion
+
public AboutDialog()
{
InitializeComponent();
@@ -47,12 +56,18 @@
{
aboutOptionsPage1.LastGenerated = m_solutionManager.MavenLastRunDateTime.ToString();
}
- else
+ if (m_solutionManager.CommonProject != null)
{
- aboutOptionsPage1.LastGenerated = "Never";
- }
aboutOptionsPage1.CommonProject = m_solutionManager.CommonProject.Name;
+ }
+ if (m_solutionManager.CoreProject != null)
+ {
aboutOptionsPage1.CoreProject = m_solutionManager.CoreProject.Name;
+ }
+ if (m_solutionManager.SchemaExportProject != null)
+ {
+ aboutOptionsPage1.SchemaExportProject = m_solutionManager.SchemaExportProject.Name;
+ }
string modelFile = m_solutionManager.ModelFilePath;
modelFile = modelFile.Replace(m_solutionManager.SolutionPath, string.Empty);
int position = modelFile.LastIndexOf('!');
@@ -60,15 +75,11 @@
{
modelFile = modelFile.Substring(0, position);
}
- aboutOptionsPage1.ModelFile = modelFile;
+ aboutOptionsPage1.ModelFile = FileUtils.GetFilename(modelFile);
}
else
{
aboutOptionsPage1.SolutionUsingMDA = "No";
- aboutOptionsPage1.LastGenerated = "n/a";
- aboutOptionsPage1.CommonProject = "n/a";
- aboutOptionsPage1.CoreProject = "n/a";
- aboutOptionsPage1.ModelFile = "n/a";
}
}
@@ -76,5 +87,6 @@
{
button1.Focus();
}
+
}
}
\ No newline at end of file
1.2 +41 -40 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.designer.cs
Index: AboutDialog.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.designer.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- AboutDialog.designer.cs 18 Apr 2006 16:14:44 -0000 1.1
+++ AboutDialog.designer.cs 3 May 2006 20:23:06 -0000 1.2
@@ -35,19 +35,20 @@
// button1
//
this.button1.BackColor = System.Drawing.SystemColors.Control;
- this.button1.Location = new System.Drawing.Point(161, 234);
+ this.button1.Location = new System.Drawing.Point(155, 297);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(73, 25);
- this.button1.TabIndex = 0;
+ this.button1.Size = new System.Drawing.Size(84, 25);
+ this.button1.TabIndex = 2;
this.button1.Text = "&Ok";
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// aboutOptionsPage1
//
+ this.aboutOptionsPage1.Dock = System.Windows.Forms.DockStyle.Top;
this.aboutOptionsPage1.Location = new System.Drawing.Point(0, 0);
this.aboutOptionsPage1.Name = "aboutOptionsPage1";
- this.aboutOptionsPage1.Size = new System.Drawing.Size(395, 228);
+ this.aboutOptionsPage1.Size = new System.Drawing.Size(394, 291);
this.aboutOptionsPage1.TabIndex = 1;
//
// AboutDialog
@@ -55,10 +56,10 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
- this.ClientSize = new System.Drawing.Size(394, 275);
+ this.ClientSize = new System.Drawing.Size(394, 331);
this.ControlBox = false;
- this.Controls.Add(this.aboutOptionsPage1);
this.Controls.Add(this.button1);
+ this.Controls.Add(this.aboutOptionsPage1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Name = "AboutDialog";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
@@ -71,7 +72,7 @@
#endregion
- private System.Windows.Forms.Button button1;
private AboutOptionsPage aboutOptionsPage1;
+ private System.Windows.Forms.Button button1;
}
}
\ No newline at end of file
1.3 +38 -24 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.cs
Index: AboutOptionsPage.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- AboutOptionsPage.cs 28 Apr 2006 16:07:24 -0000 1.2
+++ AboutOptionsPage.cs 3 May 2006 20:23:06 -0000 1.3
@@ -18,9 +18,23 @@
{
public partial class AboutOptionsPage : UserControl, EnvDTE.IDTToolsOptionsPage
{
+
+ #region Member variables
+
+ static AboutOptionsPage m_properties = new AboutOptionsPage();
+
+ #endregion
+
+ #region Properties
+
public string SolutionUsingMDA
{
- set { lblSolutionUsingMDA.Text = value; }
+ set
+ {
+ bool solutionEnabled = value == "Yes";
+ pnlSolutionInfo.Visible = solutionEnabled;
+ lblSolutionUsingMDA.Text = value;
+ }
}
public string LastGenerated
@@ -43,23 +57,27 @@
set { lblModelFile.Text = value; }
}
- static AboutOptionsPage m_properties = new AboutOptionsPage();
+ public string SchemaExportProject
+ {
+ set { lblSchemaExportProject.Text = value; }
+ }
+
+ #endregion
public AboutOptionsPage()
{
InitializeComponent();
//linkLabel1.Links.Add(0, linkLabel1.Text.Length);
- lblVersion.Text = VS80AddIn.ADD_IN_VERSION;
+ lblVersion.Text = "v" + VS80AddIn.ADD_IN_VERSION;
}
#region IDTToolsOptionsPage Members
- public void GetProperties(ref object PropertiesObject)
+ public void OnAfterCreated(EnvDTE.DTE DTEObject)
{
- PropertiesObject = m_properties;
}
- public void OnAfterCreated(EnvDTE.DTE DTEObject)
+ public void OnOK()
{
}
@@ -71,8 +89,9 @@
{
}
- public void OnOK()
+ public void GetProperties(ref object PropertiesObject)
{
+ PropertiesObject = m_properties;
}
#endregion
@@ -83,11 +102,6 @@
System.Diagnostics.Process.Start(label.Text);
}
- private void AboutOptionsPage_Load(object sender, EventArgs e)
- {
-
- }
-
}
[System.Runtime.InteropServices.ComVisible(true)]
1.4 +267 -149 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.designer.cs
Index: AboutOptionsPage.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.designer.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AboutOptionsPage.designer.cs 28 Apr 2006 16:07:24 -0000 1.3
+++ AboutOptionsPage.designer.cs 3 May 2006 20:23:06 -0000 1.4
@@ -28,152 +28,52 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutOptionsPage));
+ this.linkLabel2 = new System.Windows.Forms.LinkLabel();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.lblVersion = new System.Windows.Forms.Label();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.pnlSolutionInfo = new System.Windows.Forms.Panel();
+ this.label7 = new System.Windows.Forms.Label();
this.lblModelFile = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.lblSchemaExportProject = new System.Windows.Forms.Label();
this.lblCommonProject = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
this.lblLastGenerated = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
this.lblCoreProject = new System.Windows.Forms.Label();
this.lblSolutionUsingMDA = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
- this.linkLabel2 = new System.Windows.Forms.LinkLabel();
- this.label1 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.lblVersion = new System.Windows.Forms.Label();
- this.groupBox2.SuspendLayout();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.label8 = new System.Windows.Forms.Label();
+ this.imageList1 = new System.Windows.Forms.ImageList(this.components);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.tabControl1.SuspendLayout();
+ this.tabPage1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.pnlSolutionInfo.SuspendLayout();
+ this.tabPage2.SuspendLayout();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.lblModelFile);
- this.groupBox2.Controls.Add(this.lblCommonProject);
- this.groupBox2.Controls.Add(this.lblLastGenerated);
- this.groupBox2.Controls.Add(this.lblCoreProject);
- this.groupBox2.Controls.Add(this.lblSolutionUsingMDA);
- this.groupBox2.Controls.Add(this.label6);
- this.groupBox2.Controls.Add(this.label5);
- this.groupBox2.Controls.Add(this.label7);
- this.groupBox2.Controls.Add(this.label4);
- this.groupBox2.Controls.Add(this.label3);
- this.groupBox2.Location = new System.Drawing.Point(3, 101);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(389, 122);
- this.groupBox2.TabIndex = 3;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Status";
- //
- // lblModelFile
- //
- this.lblModelFile.AutoSize = true;
- this.lblModelFile.Location = new System.Drawing.Point(169, 98);
- this.lblModelFile.Name = "lblModelFile";
- this.lblModelFile.Size = new System.Drawing.Size(24, 13);
- this.lblModelFile.TabIndex = 1;
- this.lblModelFile.Text = "n/a";
- //
- // lblCommonProject
- //
- this.lblCommonProject.AutoSize = true;
- this.lblCommonProject.Location = new System.Drawing.Point(169, 78);
- this.lblCommonProject.Name = "lblCommonProject";
- this.lblCommonProject.Size = new System.Drawing.Size(24, 13);
- this.lblCommonProject.TabIndex = 1;
- this.lblCommonProject.Text = "n/a";
- //
- // lblLastGenerated
- //
- this.lblLastGenerated.AutoSize = true;
- this.lblLastGenerated.Location = new System.Drawing.Point(169, 38);
- this.lblLastGenerated.Name = "lblLastGenerated";
- this.lblLastGenerated.Size = new System.Drawing.Size(24, 13);
- this.lblLastGenerated.TabIndex = 1;
- this.lblLastGenerated.Text = "n/a";
- //
- // lblCoreProject
- //
- this.lblCoreProject.AutoSize = true;
- this.lblCoreProject.Location = new System.Drawing.Point(169, 58);
- this.lblCoreProject.Name = "lblCoreProject";
- this.lblCoreProject.Size = new System.Drawing.Size(24, 13);
- this.lblCoreProject.TabIndex = 1;
- this.lblCoreProject.Text = "n/a";
- //
- // lblSolutionUsingMDA
- //
- this.lblSolutionUsingMDA.AutoSize = true;
- this.lblSolutionUsingMDA.Location = new System.Drawing.Point(169, 18);
- this.lblSolutionUsingMDA.Name = "lblSolutionUsingMDA";
- this.lblSolutionUsingMDA.Size = new System.Drawing.Size(40, 13);
- this.lblSolutionUsingMDA.TabIndex = 1;
- this.lblSolutionUsingMDA.Text = "yes/no";
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(105, 98);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(58, 13);
- this.label6.TabIndex = 0;
- this.label6.Text = "Model File:";
- this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(76, 78);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(87, 13);
- this.label5.TabIndex = 0;
- this.label5.Text = "Common Project:";
- this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(80, 38);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(83, 13);
- this.label7.TabIndex = 0;
- this.label7.Text = "Last Generated:";
- this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(95, 58);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(68, 13);
- this.label4.TabIndex = 0;
- this.label4.Text = "Core Project:";
- this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(8, 18);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(155, 13);
- this.label3.TabIndex = 0;
- this.label3.Text = "Solution is AndroMDA Enabled:";
- this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
// linkLabel2
//
- this.linkLabel2.AutoSize = true;
- this.linkLabel2.BackColor = System.Drawing.Color.Black;
- this.linkLabel2.Location = new System.Drawing.Point(257, 72);
+ this.linkLabel2.ForeColor = System.Drawing.Color.Black;
+ this.linkLabel2.Location = new System.Drawing.Point(6, 50);
this.linkLabel2.Name = "linkLabel2";
- this.linkLabel2.Size = new System.Drawing.Size(135, 13);
+ this.linkLabel2.Size = new System.Drawing.Size(369, 17);
this.linkLabel2.TabIndex = 1;
this.linkLabel2.TabStop = true;
this.linkLabel2.Text = "http://www.andromda.org/";
- this.linkLabel2.Visible = false;
+ this.linkLabel2.TextAlign = System.Drawing.ContentAlignment.TopCenter;
this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel_LinkClicked);
//
// label1
@@ -215,29 +115,238 @@
this.lblVersion.BackColor = System.Drawing.Color.Black;
this.lblVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblVersion.ForeColor = System.Drawing.Color.LightGray;
- this.lblVersion.Location = new System.Drawing.Point(319, 56);
+ this.lblVersion.Location = new System.Drawing.Point(249, 56);
this.lblVersion.Name = "lblVersion";
this.lblVersion.Size = new System.Drawing.Size(73, 13);
this.lblVersion.TabIndex = 0;
this.lblVersion.Text = "version";
- this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.ImageList = this.imageList1;
+ this.tabControl1.Location = new System.Drawing.Point(0, 99);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(395, 190);
+ this.tabControl1.TabIndex = 5;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Controls.Add(this.groupBox2);
+ this.tabPage1.ImageIndex = 0;
+ this.tabPage1.Location = new System.Drawing.Point(4, 23);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(387, 163);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "Status";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.pnlSolutionInfo);
+ this.groupBox2.Controls.Add(this.lblSolutionUsingMDA);
+ this.groupBox2.Controls.Add(this.label3);
+ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox2.Location = new System.Drawing.Point(3, 3);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(381, 157);
+ this.groupBox2.TabIndex = 0;
+ this.groupBox2.TabStop = false;
+ //
+ // pnlSolutionInfo
+ //
+ this.pnlSolutionInfo.Controls.Add(this.label7);
+ this.pnlSolutionInfo.Controls.Add(this.lblModelFile);
+ this.pnlSolutionInfo.Controls.Add(this.label4);
+ this.pnlSolutionInfo.Controls.Add(this.lblSchemaExportProject);
+ this.pnlSolutionInfo.Controls.Add(this.lblCommonProject);
+ this.pnlSolutionInfo.Controls.Add(this.label9);
+ this.pnlSolutionInfo.Controls.Add(this.label5);
+ this.pnlSolutionInfo.Controls.Add(this.lblLastGenerated);
+ this.pnlSolutionInfo.Controls.Add(this.label6);
+ this.pnlSolutionInfo.Controls.Add(this.lblCoreProject);
+ this.pnlSolutionInfo.Location = new System.Drawing.Point(6, 36);
+ this.pnlSolutionInfo.Name = "pnlSolutionInfo";
+ this.pnlSolutionInfo.Size = new System.Drawing.Size(372, 115);
+ this.pnlSolutionInfo.TabIndex = 8;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(69, 0);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(83, 13);
+ this.label7.TabIndex = 0;
+ this.label7.Text = "Last Generated:";
+ this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // lblModelFile
+ //
+ this.lblModelFile.AutoSize = true;
+ this.lblModelFile.Location = new System.Drawing.Point(158, 76);
+ this.lblModelFile.Name = "lblModelFile";
+ this.lblModelFile.Size = new System.Drawing.Size(83, 13);
+ this.lblModelFile.TabIndex = 1;
+ this.lblModelFile.Text = "unable to locate";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(84, 19);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(68, 13);
+ this.label4.TabIndex = 0;
+ this.label4.Text = "Core Project:";
+ this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // lblSchemaExportProject
+ //
+ this.lblSchemaExportProject.AutoSize = true;
+ this.lblSchemaExportProject.Location = new System.Drawing.Point(158, 57);
+ this.lblSchemaExportProject.Name = "lblSchemaExportProject";
+ this.lblSchemaExportProject.Size = new System.Drawing.Size(83, 13);
+ this.lblSchemaExportProject.TabIndex = 1;
+ this.lblSchemaExportProject.Text = "unable to locate";
+ //
+ // lblCommonProject
+ //
+ this.lblCommonProject.AutoSize = true;
+ this.lblCommonProject.Location = new System.Drawing.Point(158, 38);
+ this.lblCommonProject.Name = "lblCommonProject";
+ this.lblCommonProject.Size = new System.Drawing.Size(83, 13);
+ this.lblCommonProject.TabIndex = 1;
+ this.lblCommonProject.Text = "unable to locate";
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Location = new System.Drawing.Point(34, 57);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(118, 13);
+ this.label9.TabIndex = 0;
+ this.label9.Text = "Schema Export Project:";
+ this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(65, 38);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(87, 13);
+ this.label5.TabIndex = 0;
+ this.label5.Text = "Common Project:";
+ this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // lblLastGenerated
+ //
+ this.lblLastGenerated.AutoSize = true;
+ this.lblLastGenerated.Location = new System.Drawing.Point(158, 0);
+ this.lblLastGenerated.Name = "lblLastGenerated";
+ this.lblLastGenerated.Size = new System.Drawing.Size(34, 13);
+ this.lblLastGenerated.TabIndex = 1;
+ this.lblLastGenerated.Text = "never";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(94, 76);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(58, 13);
+ this.label6.TabIndex = 0;
+ this.label6.Text = "Model File:";
+ this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // lblCoreProject
+ //
+ this.lblCoreProject.AutoSize = true;
+ this.lblCoreProject.Location = new System.Drawing.Point(158, 19);
+ this.lblCoreProject.Name = "lblCoreProject";
+ this.lblCoreProject.Size = new System.Drawing.Size(83, 13);
+ this.lblCoreProject.TabIndex = 1;
+ this.lblCoreProject.Text = "unable to locate";
+ //
+ // lblSolutionUsingMDA
+ //
+ this.lblSolutionUsingMDA.AutoSize = true;
+ this.lblSolutionUsingMDA.Location = new System.Drawing.Point(164, 16);
+ this.lblSolutionUsingMDA.Name = "lblSolutionUsingMDA";
+ this.lblSolutionUsingMDA.Size = new System.Drawing.Size(40, 13);
+ this.lblSolutionUsingMDA.TabIndex = 7;
+ this.lblSolutionUsingMDA.Text = "yes/no";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(3, 16);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(155, 13);
+ this.label3.TabIndex = 6;
+ this.label3.Text = "Solution is AndroMDA Enabled:";
+ this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.groupBox1);
+ this.tabPage2.ImageIndex = 1;
+ this.tabPage2.Location = new System.Drawing.Point(4, 23);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(387, 163);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "About";
+ this.tabPage2.UseVisualStyleBackColor = true;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.label8);
+ this.groupBox1.Controls.Add(this.linkLabel2);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox1.Location = new System.Drawing.Point(3, 3);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(381, 157);
+ this.groupBox1.TabIndex = 2;
+ this.groupBox1.TabStop = false;
+ //
+ // label8
+ //
+ this.label8.Location = new System.Drawing.Point(6, 16);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(369, 34);
+ this.label8.TabIndex = 2;
+ this.label8.Text = "AndroMDA Visual Studio 2005 Add-In\r\n(c)2006 AndroMDA.org";
+ this.label8.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+ //
+ // imageList1
+ //
+ this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+ this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+ this.imageList1.Images.SetKeyName(0, "propertiesORoptions.ico");
+ this.imageList1.Images.SetKeyName(1, "help.ico");
//
// AboutOptionsPage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.tabControl1);
this.Controls.Add(this.label2);
this.Controls.Add(this.lblVersion);
this.Controls.Add(this.label1);
- this.Controls.Add(this.linkLabel2);
this.Controls.Add(this.pictureBox1);
- this.Controls.Add(this.groupBox2);
this.Name = "AboutOptionsPage";
this.Size = new System.Drawing.Size(395, 289);
- this.Load += new System.EventHandler(this.AboutOptionsPage_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage1.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.pnlSolutionInfo.ResumeLayout(false);
+ this.pnlSolutionInfo.PerformLayout();
+ this.tabPage2.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -245,21 +354,30 @@
#endregion
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.Label lblCommonProject;
- private System.Windows.Forms.Label lblCoreProject;
- private System.Windows.Forms.Label lblSolutionUsingMDA;
- private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Label label4;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.LinkLabel linkLabel2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label lblVersion;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.ImageList imageList1;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.Panel pnlSolutionInfo;
+ private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label lblModelFile;
- private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label lblCommonProject;
+ private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label lblLastGenerated;
- private System.Windows.Forms.Label label7;
- private System.Windows.Forms.Label lblVersion;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label lblCoreProject;
+ private System.Windows.Forms.Label lblSolutionUsingMDA;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label lblSchemaExportProject;
+ private System.Windows.Forms.Label label9;
}
}
1.2 +62 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.resx
Index: AboutOptionsPage.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.resx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- AboutOptionsPage.resx 18 Apr 2006 16:14:44 -0000 1.1
+++ AboutOptionsPage.resx 3 May 2006 20:23:06 -0000 1.2
@@ -684,4 +684,66 @@
gAoAKACgAoAKACgAoAKACgAoAKACgAoAKAP/2Q==
</value>
</data>
+ <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8
+ CwAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ AwABEAMAAQEBAAEgBgABEBoAAX0CAwH/AWACAwH/AWACAwH/AWACAwH/AWACAwH/AWACAwH/AWACAwH/
+ AWACAwH/AWACAwH/AWACAwH/AWACAwH/AWECAwH/AbcCAwH/EAABBwIBAQcBHgIBASgBPQIBAWcBTAIC
+ AZkBTwICAa0BTgICAa4BTgICAaIBQwIBAXcBJwIBATgBDAIBAQ4BAgMBkAAB7AHaAdMC/wHoAdYC/wHm
+ AdIC/wHlAc4C/wHiAcoC/wHhAcYC/wHgAcMC/wHdAb8C/wHcAbsC/wHaAbgC/wHZAbMB/wGLAVkBVQH/
+ AbMCAwH/DAABCgIBAQwBMwIBAU8B3QHJAcAB/AH0AegB4wH/AvQB8wH/AfAB8gHzAf8B8QHyAfMB/wH0
+ Ae0B6QH/Ae4B2wHQAf8BVgITAdQBQQIBAXABFAIBARkBAgMBjAAB4gHZAdIC/wHqAdUC/wHoAc8C/wHl
+ AcoC/wHiAcQC/wHeAb8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAVcBWwH/AbMCAwH/
+ CAABCQIBAQoBRQICAXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAXUB/wHCAXsBVQH/AcwBjwF0
+ Af8B3wHOAcQB/wHtAfAB8gH/AfYC9AH/AbEBkAGIAfgBRQIBAX0BEgIBARYBAgMBiAAB5AHdAdYC/wHt
+ AdsC/wHqAdYC/wHoAdEC/wHqAccB/wHBAboB0gL/AecBvgL/Ad4BuwL/AdsBtgL/AdgBsQL/AdcBqQH/
+ AYsBWQFcAf8BswIDAf8IAAEwAgEBSgH3AfEB7QH/AfAB9AH1Af8ByAGBAWAB/wG/AV4BLQH/AcIBaQE7
+ Af8B7AHuAe8B/wHSAYgBZgH/AcABYQEwAf8BvQFjATUB/wHqAekB6AH/AfUB9gH3Af8BigFfAVoB8QE7
+ AgEBYAEIAgEBCYgAAeYB4AHbAv8B8wHmAv8B8wHmAv8B7gG+Af8BJwFDAe8B/wEDATYC/wFjAXIB4AL/
+ Ad4BvQL/Ad4BvQL/Ad4BvQL/Ad4BvQH/AY4BXAFdAf8BswIDAf8IAAHxAd4B0wH/AfQC9gH/AcQBcQFG
+ Af8BxQFmATUB/wHLAWkBNgH/AcABcgFKAf8B/gP/AdkBqAGPAf8BygFoATYB/wHHAWYBNAH/AbwBWwEp
+ Af8B7gHvAfAB/wH2Ae4B6gH/AVACBAG6ARwCAQEliAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/AQMBKwL/
+ AQMBLAL/ARQBQwL/AQMBLQL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgFdAV4B/wGzAgMB/wQA
+ ATECAQFLAfkB+gH5Af8B4QHBAbEB/wHGAWYBNQH/AcwBagE4Af8BzAFqATcB/wHMAWkBNQH/AcoBYwEu
+ Af8BywFmATIB/wHMAWkBNgH/AcsBaQE3Af8BxwFnATUB/wHGAXkBUAH/AfMC9QH/AdMBvwG0AfwBNAIB
+ AVKIAAHrAeYB4wL/AeUByQH/AVgBcwHzAf8BJwFNAv8B/AHkAbkC/wHpAbIB/wEDASoC/wEfAUIB8wL/
+ AdwBrAL/AdUBrAL/Ad4BuQH/AY8BXgFgAf8BswIDAf8EAAGlAWcBYQHhAfoB/QH+Af8BxgFpATkB/wHN
+ AWsBOQH/Ac0BawE4Af8BzAFpATYB/wHHAWoBOgX/AdoBkQFuAf8BzAFpATYB/wHMAWoBNwH/AcsBaQE3
+ Af8BwQFfASsB/wPxAf8B8gHfAdUB/wFDAgEBd4gAAe0B6gHnAv8B5wHOAv8B5AHCAv8B4wG+Av8B3gG9
+ Av8B3AG6Af8CpQHZAf8BAwEzAv8BxgGzAbwC/wHXAa8C/wHhAb4B/wGTAWABYgH/AbMCAwH/BAAB6gHT
+ AcgC/gP/AcoBaAE1Af8B0AFuATsB/wHMAWkBNgH/AcwBaQE2Af8BzAFmATIB/wHkAeoB7AH/AfoB8QHs
+ Af8BygFjAS8B/wHMAWkBNgH/Ac0BawE4Af8ByAFnATUB/wHrAdsB0wH/AfUB6QHjAf8BRwICAYKIAAHv
+ Ae0B6wL/AegB0QL/AeEBwwL/AeABwAL/Ad8BvgL/Ad0BuwL/AeUBtQH/AQ4BOAL/AQMBKgP/Ad4BvQL/
+ AeQBxAH/AZQBYgFkAf8BswIDAf8EAAHwAdwB0QX/AdIBbwE8Af8B0wFxAT4B/wHMAWkBNgH/AcwBaQE2
+ Af8BzAFpATYB/wHFAWsBPAH/AfYB+QH7Af8B+wHxAe0B/wHLAWUBMAH/Ac8BbAE6Af8BzAFrATkB/wHu
+ AdsB0gH/AfcB7AHlAf8BRQIBAXyIAAHyAvEC/wHnAdEC/wHgAcAC/wHfAb8C/wHdAbwC/wHcAboC/wHb
+ AbgB/wHtAdYBvwH/AQMBMAL/AWMBbgHbAv8B5gHJAf8BmAFkAWYB/wGzAgMB/wQAAdMBrAGjAfUE/wHf
+ AXwBSQH/AdsBeQFHAf8BzgFrATgB/wHLAWQBLwH/AcsBZwEzAf8BzAFpATYB/wHEAXcBTwX/AdwBlAFz
+ Af8B0gFwAT4B/wHPAWwBOQH/AfsB9QHzAf8B9QHkAdwB/wE6AgEBX4gAAfQC8wL/AeIBxgL/AdcBsQL/
+ AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AUkBZQHzAf8B/AHdAaUC/wHpAc8B/wGaAWQBZgH/
+ AbMCAwH/BAABSgIFAYAE/wH7AckBrgH/Ae4BigFaAf8B0gF5AUsB/wHxAfYB+QH/AesBwgGuAf8BywFm
+ ATIB/wHKAXMBRgX/Ad8BpQGJAf8B3AF6AUgB/wHYAXkBRwX/AegB0AHGAf4BIwIBATGIAAL2AfUC/wHh
+ AcIC/wHWAawC/wHVAasC/wHVAasC/wHUAakC/wHUAakC/wHTAagC/wHVAaYC/wHRAaQC/wHtAdYB/wGc
+ AWIBYwH/AbMCAwH/CAAB9gHoAeAG/wGjAXEB/wH6AZUBZAH/Ac0BxgHDBf8B/AH1AfEF/wH2AfsB/QH/
+ AeYBgwFVAf8B6wGDAVIB/wH9AfUB7gH/Af4C/AH/AU0CBAGTAQwCAQEOiAAC+AH1Cv8B/gP/AfsB+QL/
+ AfkB9AL/AfYB7wL/AfQB6gL/AfMB5gH/AfsB8AHjAv8B8QHXAf8BnwFeAV8B/wGwAgMB/wgAAU0CBQGG
+ Cf8B0AGcAv8BuwGHAf8B6QG/AaoB/wHXAccBwAH/Ad8ByQG/Af8B/AGpAX8C/wGkAXIC/wHoAdcF/wHe
+ AcoBwQH8AR4CAQEoAQMCAQECiAAB+gH5AfcO/wL+Av8B+wH4Av8B+QH0Av8B9gHuAf8B7gHfAdoB/wHx
+ AZgBJQH/Ad4BgQEPAf8BugGJAX4B/wHKAgMB/wgAAQIDAQGLAUYBQgHTCv8B7QL/AfsB0QL/Ae8BuwL/
+ AeQBsQL/AesBzQn/AesB1AHKAf4BIwIBATEBBAIBAQSMAAH9AfoB+BL/Av4C/wH8AfkC/wH5AfQB/wHv
+ AeEB3AL/Ac8BfAH/AboBiQF+Af8BygIDAf8QAAECAwEBSAEEAQMBewH1AeYB3hX/AfoB8QHsAf8BrgF2
+ AXAB6QEYAgEBHwEDAgEBA5AAAfcB0gGvAf8B8gHLAasB/wHqAcQBpwH/AeEBuwGiAf8B2QGzAZ0B/wHQ
+ AaoBmAH/AcoBpAGUAf8ByAGiAZMB/wHIAaIBkwH/AboBiQF+Af8BygIDAf8gAAFBAQMBAgFtAb4BiwGF
+ AewB6wHUAckB/gHgAcUBuQH6AVoCDQGemAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGA
+ FwAD/wEAAcABAQHgAQMEAAHAAQEBwAEBBAABwAEBAYAFAAHAAQEBgAUAAcABAQGABQABwAEBBgABwAEB
+ BgABwAEBBgABwAEBBgABwAEBBgABwAEBBgABwAEBAYAFAAHAAQEBgAUAAcABAQGAAQEEAAHAAQMBwAED
+ BAABwAEHAfgBPwQACw==
+</value>
+ </data>
</root>
\ No newline at end of file
1.2 +33 -70 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.cs
Index: ExternalToolsOptionsPage.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ExternalToolsOptionsPage.cs 18 Apr 2006 17:18:51 -0000 1.1
+++ ExternalToolsOptionsPage.cs 3 May 2006 20:23:06 -0000 1.2
@@ -21,9 +21,13 @@
public partial class ExternalToolsOptionsPage : UserControl, EnvDTE.IDTToolsOptionsPage
{
+ #region Member variables
+
static MDAOptionPageProperties m_properties = new MDAOptionPageProperties();
static AddInSettings m_settings = null;
+ #endregion
+
public ExternalToolsOptionsPage()
{
InitializeComponent();
@@ -31,16 +35,9 @@
#region IDTToolsOptionsPage Members
- public void GetProperties(ref object PropertiesObject)
- {
- PropertiesObject = m_properties;
- System.Windows.Forms.MessageBox.Show("GetProperties");
- }
-
public void OnAfterCreated(DTE DTEObject)
{
m_settings = new AddInSettings(DTEObject);
- txtMavenExecutable.Text = m_settings.MavenExecutablePath;
cbUseOfflineMode.Checked = m_settings.MavenUseOfflineMode;
cbUseClean.Checked = m_settings.MavenCleanFirst;
cbUseCustomCommandLine.Checked = m_settings.MavenUseCustomCommandLine;
@@ -50,22 +47,14 @@
UpdateState();
}
- protected void UpdateState()
- {
- cbUseClean.Enabled = !cbUseCustomCommandLine.Checked;
- cbUseOfflineMode.Enabled = !cbUseCustomCommandLine.Checked;
- txtCustomCommandLine.Enabled = cbUseCustomCommandLine.Checked;
- }
-
- protected override void OnEnter(EventArgs e)
- {
- base.OnEnter(e);
-
- }
-
- protected override void OnVisibleChanged(EventArgs e)
+ public void OnOK()
{
- base.OnVisibleChanged(e);
+ m_settings.MavenUseOfflineMode = cbUseOfflineMode.Checked;
+ m_settings.MavenCleanFirst = cbUseClean.Checked;
+ m_settings.MavenUseCustomCommandLine = cbUseCustomCommandLine.Checked;
+ m_settings.MavenCustomCommandLine = txtCustomCommandLine.Text;
+ m_settings.MagicDrawPath = txtMagicDrawPath.Text;
+ m_settings.AutoMakeModelFileWritable = cbMakeModelWritable.Checked;
}
public void OnEnter()
@@ -80,49 +69,23 @@
{
}
- public void OnOK()
+ public void GetProperties(ref object PropertiesObject)
{
- m_settings.MavenExecutablePath = txtMavenExecutable.Text;
- m_settings.MavenUseOfflineMode = cbUseOfflineMode.Checked;
- m_settings.MavenCleanFirst = cbUseClean.Checked;
- m_settings.MavenUseCustomCommandLine = cbUseCustomCommandLine.Checked;
- m_settings.MavenCustomCommandLine = txtCustomCommandLine.Text;
- m_settings.MagicDrawPath = txtMagicDrawPath.Text;
- m_settings.AutoMakeModelFileWritable = cbMakeModelWritable.Checked;
+ PropertiesObject = m_properties;
}
#endregion
- private void cbUseCustomCommandLine_CheckedChanged(object sender, EventArgs e)
+ prot...
[truncated message content] |
