Thread: [Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMD

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

  User: cmicali 
  Date: 06/05/27 08:05:59

  Modified:    etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
                        Add-In Readme.rtf
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
                        AddInSettings.cs AndroMDA.VS80AddIn.csproj
                        MDAProject.cs MDASolutionManager.cs VS80AddIn.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
                        OpenModelCommand.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
                        ExternalToolsOptionsPage.cs
                        GeneralOptionsPage.Designer.cs
                        GeneralOptionsPage.cs GeneralOptionsPage.resx
               etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
                        VS2005 Add-In Setup.exe
  Log:
  - Updated version number to 1.2
  - Changed resync code to compute solution hash in realtime, removes requirement to store hash codes in project files
  - Added option for resync to exclude files that are marked as hidden in the file system
  - Updated ignored files UI in options page to be more clear and easy to use (list box with add/remove instead of semicolon delimited list)
  - Made ignore list case insensitive
  - Updated compiled version in installer
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6       +30 -12    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.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- AddInSettings.cs	4 May 2006 18:55:35 -0000	1.5
  +++ AddInSettings.cs	27 May 2006 15:05:58 -0000	1.6
  @@ -42,12 +42,13 @@
               {
                   FirstRun = false;
                   AddInBuild = ADDIN_SETTINGS_VERSION;
  -                ResyncIgnoreList = "CVS;.cvsignore;.svn;.svnignore";
  +                ResyncIgnoreList = "CVS;.cvsignore;.svn;.svnignore;_svn";
  +				ResyncIgnoreHiddenFiles = false;
                   MavenUseOfflineMode = true;
                   MavenCleanFirst = true;
                   MavenUseCustomCommandLine = false;
                   MavenCustomCommandLine = "-o clean mda";
  -                MagicDrawPath = "C:\\Program Files\\MagicDraw UML Community Edition\\bin\\mduml.exe";
  +                UMLModellerPath = "C:\\Program Files\\MagicDraw UML Community Edition\\bin\\mduml.exe";
                   Dialogs.AddInWelcome welcome = new Dialogs.AddInWelcome();
                   welcome.ShowDialog();
               }
  @@ -80,13 +81,27 @@
               set { m_settings.SetInt("AMDABuild", value); }
           }
   
  +		#endregion
  +
  +		#region Resync settings
  +
           public string ResyncIgnoreList
           {
               get { return m_settings["AMDAIgnoreLst"]; }
               set { m_settings["AMDAIgnoreLst"] = value; }
           }
   
  -        public string MagicDrawPath
  +		public bool ResyncIgnoreHiddenFiles
  +		{
  +			get { return m_settings.GetBool("AMDARIHdnFl", false); }
  +			set { m_settings.SetBool("AMDARIHdnFl", value); }
  +		}
  +
  +		#endregion
  +
  +		#region External tool settings
  +
  +		public string UMLModellerPath
           {
               get { return m_settings["AMDAMgcDrawPth"]; }
               set { m_settings["AMDAMgcDrawPth"] = value; }
  @@ -176,7 +191,7 @@
   
           #endregion
   
  -        #region Command settings
  +        #region Tool bar button settings
   
           public bool ShowAboutButton
           {
  @@ -215,10 +230,13 @@
           {
               // Get the list of files to ignore
               string[] ignoreFiles = ResyncIgnoreList.Split(new char[] { ';' });
  +			if (stripPath)
  +			{
               file = FileUtils.GetFilename(file);
  +			}
               foreach (string s in ignoreFiles)
               {
  -                if (s.Equals(file))
  +                if (s.ToLower().Equals(file.ToLower()))
                   {
                       return true;
                   }
  
  
  
  1.7       +1 -0      plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj
  
  Index: AndroMDA.VS80AddIn.csproj
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- AndroMDA.VS80AddIn.csproj	2 May 2006 21:33:42 -0000	1.6
  +++ AndroMDA.VS80AddIn.csproj	27 May 2006 15:05:58 -0000	1.7
  @@ -12,6 +12,7 @@
       <AssemblyName>AndroMDA.VS80AddIn</AssemblyName>
       <RootNamespace>AndroMDA.VS80AddIn</RootNamespace>
       <ApplicationIcon>AddIn.ico</ApplicationIcon>
  +    <SignAssembly>false</SignAssembly>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
       <DebugSymbols>true</DebugSymbols>
  
  
  
  1.2       +2 -50     plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDAProject.cs
  
  Index: MDAProject.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDAProject.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- MDAProject.cs	18 Apr 2006 16:14:43 -0000	1.1
  +++ MDAProject.cs	27 May 2006 15:05:58 -0000	1.2
  @@ -66,54 +66,6 @@
               set { m_name = value; }
           }
   
  -        public int FileListHashCodeSrc
  -        {
  -            get
  -            {
  -                if (m_project.Globals.get_VariableExists("AMDASrcHash"))
  -                {
  -                    string value = m_project.Globals["AMDASrcHash"].ToString();
  -                    return int.Parse(value);
  -                }
  -                else
  -                {
  -                    return -1;
  -                }
  -            }
  -            set
  -            {
  -                if (value != FileListHashCodeSrc)
  -                {
  -                    m_project.Globals["AMDASrcHash"] = value.ToString();
  -                    m_project.Globals.set_VariablePersists("AMDASrcHash", true);
  -                }
  -            }
  -        }
  -
  -        public int FileListHashCodeTarget
  -        {
  -            get
  -            {
  -                if (m_project.Globals.get_VariableExists("AMDATrgtHash"))
  -                {
  -                    string value = m_project.Globals["AMDATrgtHash"].ToString();
  -                    return int.Parse(value);
  -                }
  -                else
  -                {
  -                    return -1;
  -                }
  -            }
  -            set
  -            {
  -                if (value != FileListHashCodeTarget)
  -                {
  -                    m_project.Globals["AMDATrgtHash"] = value.ToString();
  -                    m_project.Globals.set_VariablePersists("AMDATrgtHash", true);
  -                }
  -            }
  -        }
  -
           public Project Project
           {
               get { return m_project; }
  
  
  
  1.9       +73 -44    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.8
  retrieving revision 1.9
  diff -u -w -r1.8 -r1.9
  --- MDASolutionManager.cs	16 May 2006 15:46:44 -0000	1.8
  +++ MDASolutionManager.cs	27 May 2006 15:05:58 -0000	1.9
  @@ -447,35 +447,24 @@
               CheckGeneratedPaths(m_commonProject);
               CheckGeneratedPaths(m_coreProject);
   
  -            m_commonProject.FileListHashCodeSrc = ResyncFolder(m_commonProject.FileListHashCodeSrc,
  -                                                               m_commonProject.ManualPathProjectItem,
  -                                                               m_commonProject.ManualPath,
  -                                                               m_commonProject.Name);
  -            
  -            m_commonProject.FileListHashCodeTarget= ResyncFolder(m_commonProject.FileListHashCodeTarget,
  -                                                                 m_commonProject.GeneratedPathProjectItem,
  -                                                                 m_commonProject.GeneratedPath,
  -                                                                 m_commonProject.Name);
  -
  -            m_coreProject.FileListHashCodeSrc = ResyncFolder(m_coreProject.FileListHashCodeSrc,
  -                                                               m_coreProject.ManualPathProjectItem,
  -                                                               m_coreProject.ManualPath,
  -                                                               m_coreProject.Name);
  -
  -            m_coreProject.FileListHashCodeTarget = ResyncFolder(m_coreProject.FileListHashCodeTarget,
  -                                                                  m_coreProject.GeneratedPathProjectItem,
  -                                                                  m_coreProject.GeneratedPath,
  -                                                                  m_coreProject.Name);
  +			// Sync common/src
  +            ResyncFolder(m_commonProject.ManualPathProjectItem, m_commonProject.ManualPath, m_commonProject.Name);
  +			// Sync common/target
  +			ResyncFolder(m_commonProject.GeneratedPathProjectItem, m_commonProject.GeneratedPath, m_commonProject.Name);
  +			// Sync core/src
  +			ResyncFolder(m_coreProject.ManualPathProjectItem, m_coreProject.ManualPath, m_coreProject.Name);
  +			// Sync core/target
  +			ResyncFolder(m_coreProject.GeneratedPathProjectItem, m_coreProject.GeneratedPath, m_coreProject.Name);
   
   			m_applicationObject.StatusBar.Progress(false, "AndroMDA: Resync complete", 1, 1);
   
   		}
   
  -        private int ResyncFolder(int fileListHashCode, ProjectItem item, string folderPath, string projectName)
  +        private void ResyncFolder(ProjectItem item, string folderPath, string projectName)
           {
               if (item == null)
               {
  -                return -1;
  +				return;
               }
   
   			/*
  @@ -507,13 +496,14 @@
               CollapseProject(uiCommonProject);
   
               UpdateResyncProgressBar("Getting file list for " + projectName + "/" + item.Name);
  -            ArrayList newFiles = GetFileListFromFilesystem(folderPath);
  -			//ArrayList existingFiles = GetFileListFromProjectTree(item);
  -            int filesHash = GetArrayListHashCode(newFiles);
  -            if (filesHash == fileListHashCode)
  +            ArrayList filesystemFileList = GetFileListFromFilesystem(folderPath);
  +			ArrayList solutionTreeFileList = GetFileListFromProjectTree(item);
  +            int filesHash = GetArrayListHashCode(filesystemFileList);
  +			int solutionHash = GetArrayListHashCode(solutionTreeFileList);
  +			if (filesHash == solutionHash)
               {
                   UpdateResyncProgressBar("Files have not changed since last resync: " + projectName + "/" + item.Name);
  -                return GetArrayListHashCode(newFiles);
  +				return;
               }
   
               UpdateResyncProgressBar("Removing all files from " + projectName + "/" + item.Name);
  @@ -527,11 +517,10 @@
   
               UpdateResyncProgressBar(projectName + "/" + item.Name);
   
  -            // Get all the files in the directory
  +            // Add the files from the filesystem into the solution
  +			// The filesystemFileList has already been filtered for ignored items
               int fileNum = 0;
  -            foreach (string file in newFiles)
  -            {
  -                if (!m_addInSettings.IsInIgnoreList(file))
  +            foreach (string file in filesystemFileList)
                   {
                       ProjectItem newItem = item.ProjectItems.AddFromFile(file);
                       Property prop = newItem.Properties.Item("BuildAction");
  @@ -543,8 +532,7 @@
                       {
                           prop.Value = VSLangProj.prjBuildAction.prjBuildActionCompile;
                       }
  -                }
  -                UpdateResyncProgressBar(file, fileNum++, newFiles.Count);
  +                UpdateResyncProgressBar(file, fileNum++, filesystemFileList.Count);
               }
   
               // Collapse the projects one more time
  @@ -553,7 +541,6 @@
   
               UpdateResyncProgressBar(projectName + "/" + item.Name);
   
  -            return GetArrayListHashCode(newFiles);
           }
   
           private int GetArrayListHashCode(ArrayList list)
  @@ -574,7 +561,19 @@
                   ArrayList filesList = new ArrayList(files.Length);
                   foreach (string file in files)
                   {
  -                    if (!m_addInSettings.IsInIgnoreList(file))
  +					bool excludeFile = m_addInSettings.IsInIgnoreList(file);
  +					// If we should ignore hidden files
  +					if (m_addInSettings.ResyncIgnoreHiddenFiles)
  +					{
  +						// Get the file attributes
  +						System.IO.FileAttributes attr = System.IO.File.GetAttributes(file);
  +						// If it's hidden, exclude it
  +						if ((attr & System.IO.FileAttributes.Hidden) > 0)
  +						{
  +							excludeFile = true;
  +						}
  +					}
  +                    if (!excludeFile)
                       {
                           filesList.Add(file);
                       }
  @@ -582,10 +581,22 @@
                   string[] directories = System.IO.Directory.GetDirectories(directory);
                   foreach (string dir in directories)
                   {
  -                    if (!m_addInSettings.IsInIgnoreList(dir))
  +					bool excludeDirectory = m_addInSettings.IsInIgnoreList(dir);
  +					// If we should ignore hidden files
  +					if (m_addInSettings.ResyncIgnoreHiddenFiles)
  +					{
  +						// Get the file attributes
  +						System.IO.FileAttributes attr = System.IO.File.GetAttributes(dir);						
  +						// If it's hidden, exclude it
  +						if ((attr & System.IO.FileAttributes.Hidden) > 0)
  +						{
  +							excludeDirectory = true;
  +						}
  +					}
  +					if (!excludeDirectory)
                       {
                           ArrayList newFiles = GetFileListFromFilesystem(dir);
  -                        foreach(string n in newFiles) { filesList.Add(n); }
  +						filesList.AddRange(newFiles);
                       }
                   }
                   return filesList;
  @@ -596,6 +607,24 @@
               }
           }
   
  +		private ArrayList GetFileListFromProjectTree(ProjectItem item)
  +		{
  +			ArrayList filesList = new ArrayList();
  +			for (short i = 1; i <= item.FileCount; i++)
  +			{
  +				string filename = item.get_FileNames(i);
  +				if (!m_addInSettings.IsInIgnoreList(filename))
  +				{
  +					filesList.Add(filename);
  +				}
  +			}
  +			foreach (ProjectItem childItem in item.ProjectItems)
  +			{
  +				filesList.AddRange(GetFileListFromProjectTree(childItem));
  +			}
  +			return filesList;
  +		}
  +
           private void RemoveAllChildren(ProjectItem item)
           {
   
  
  
  
  1.7       +1 -1      plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/VS80AddIn.cs
  
  Index: VS80AddIn.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/VS80AddIn.cs,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- VS80AddIn.cs	16 May 2006 15:46:44 -0000	1.6
  +++ VS80AddIn.cs	27 May 2006 15:05:58 -0000	1.7
  @@ -20,7 +20,7 @@
       public class VS80AddIn
       {
   
  -		public const string ADD_IN_VERSION = "1.1";
  +		public const string ADD_IN_VERSION = "1.2";
   
           #region Constants
   
  
  
  
  1.6       +1 -1      plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs
  
  Index: OpenModelCommand.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- OpenModelCommand.cs	16 May 2006 15:46:44 -0000	1.5
  +++ OpenModelCommand.cs	27 May 2006 15:05:59 -0000	1.6
  @@ -25,7 +25,7 @@
   
           public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
           {
  -            string magicDrawPath = m_addInSettings.MagicDrawPath;
  +            string magicDrawPath = m_addInSettings.UMLModellerPath;
               if (magicDrawPath != string.Empty && System.IO.File.Exists(magicDrawPath) && System.IO.File.Exists(m_solutionManager.ModelFilePath) )
               {
                   try
  
  
  
  1.3       +2 -2      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.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- ExternalToolsOptionsPage.cs	3 May 2006 20:23:06 -0000	1.2
  +++ ExternalToolsOptionsPage.cs	27 May 2006 15:05:59 -0000	1.3
  @@ -42,7 +42,7 @@
               cbUseClean.Checked = m_settings.MavenCleanFirst;
               cbUseCustomCommandLine.Checked = m_settings.MavenUseCustomCommandLine;
               txtCustomCommandLine.Text = m_settings.MavenCustomCommandLine;
  -            txtMagicDrawPath.Text = m_settings.MagicDrawPath;
  +            txtMagicDrawPath.Text = m_settings.UMLModellerPath;
               cbMakeModelWritable.Checked = m_settings.AutoMakeModelFileWritable;
               UpdateState();
           }
  @@ -53,7 +53,7 @@
               m_settings.MavenCleanFirst = cbUseClean.Checked;
               m_settings.MavenUseCustomCommandLine = cbUseCustomCommandLine.Checked;
               m_settings.MavenCustomCommandLine = txtCustomCommandLine.Text;
  -            m_settings.MagicDrawPath = txtMagicDrawPath.Text;
  +            m_settings.UMLModellerPath = txtMagicDrawPath.Text;
               m_settings.AutoMakeModelFileWritable = cbMakeModelWritable.Checked;
           }
   
  
  
  
  1.4       +70 -10    plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.Designer.cs
  
  Index: GeneralOptionsPage.Designer.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.Designer.cs,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- GeneralOptionsPage.Designer.cs	3 May 2006 20:23:06 -0000	1.3
  +++ GeneralOptionsPage.Designer.cs	27 May 2006 15:05:59 -0000	1.4
  @@ -28,6 +28,7 @@
           /// </summary>
           private void InitializeComponent()
           {
  +			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GeneralOptionsPage));
   			this.groupBox1 = new System.Windows.Forms.GroupBox();
   			this.cbHideSchemaExportButton = new System.Windows.Forms.CheckBox();
   			this.cbShowSchemaExportButton = new System.Windows.Forms.CheckBox();
  @@ -36,6 +37,10 @@
   			this.label2 = new System.Windows.Forms.Label();
   			this.txtResyncIgnoreList = new System.Windows.Forms.TextBox();
   			this.groupBox2 = new System.Windows.Forms.GroupBox();
  +			this.cbIgnoreHiddenFiles = new System.Windows.Forms.CheckBox();
  +			this.btnDeleteResyncIgnoreItem = new System.Windows.Forms.Button();
  +			this.btnAddResyncIgnoreItem = new System.Windows.Forms.Button();
  +			this.lstResyncIgnoreList = new System.Windows.Forms.ListBox();
   			this.groupBox1.SuspendLayout();
   			this.groupBox2.SuspendLayout();
   			this.SuspendLayout();
  @@ -46,12 +51,12 @@
   			this.groupBox1.Controls.Add(this.cbShowSchemaExportButton);
   			this.groupBox1.Controls.Add(this.cbShowOpenModelButton);
   			this.groupBox1.Controls.Add(this.cbShowAboutButton);
  -			this.groupBox1.Location = new System.Drawing.Point(0, 77);
  +			this.groupBox1.Location = new System.Drawing.Point(0, 157);
   			this.groupBox1.Name = "groupBox1";
   			this.groupBox1.Size = new System.Drawing.Size(395, 117);
   			this.groupBox1.TabIndex = 2;
   			this.groupBox1.TabStop = false;
  -			this.groupBox1.Text = "Appearance";
  +			this.groupBox1.Text = "Toolbar Appearance";
   			// 
   			// cbHideSchemaExportButton
   			// 
  @@ -59,7 +64,7 @@
   			this.cbHideSchemaExportButton.Location = new System.Drawing.Point(33, 65);
   			this.cbHideSchemaExportButton.Name = "cbHideSchemaExportButton";
   			this.cbHideSchemaExportButton.Size = new System.Drawing.Size(253, 17);
  -			this.cbHideSchemaExportButton.TabIndex = 0;
  +			this.cbHideSchemaExportButton.TabIndex = 2;
   			this.cbHideSchemaExportButton.Text = "&Hide schema export button if project unavailable";
   			this.cbHideSchemaExportButton.UseVisualStyleBackColor = true;
   			// 
  @@ -69,7 +74,7 @@
   			this.cbShowSchemaExportButton.Location = new System.Drawing.Point(11, 42);
   			this.cbShowSchemaExportButton.Name = "cbShowSchemaExportButton";
   			this.cbShowSchemaExportButton.Size = new System.Drawing.Size(208, 17);
  -			this.cbShowSchemaExportButton.TabIndex = 0;
  +			this.cbShowSchemaExportButton.TabIndex = 1;
   			this.cbShowSchemaExportButton.Text = "Show s&chema export button on toolbar";
   			this.cbShowSchemaExportButton.UseVisualStyleBackColor = true;
   			this.cbShowSchemaExportButton.CheckedChanged += new System.EventHandler(this.cbShowSchemaExportButton_CheckedChanged);
  @@ -80,7 +85,7 @@
   			this.cbShowOpenModelButton.Location = new System.Drawing.Point(11, 88);
   			this.cbShowOpenModelButton.Name = "cbShowOpenModelButton";
   			this.cbShowOpenModelButton.Size = new System.Drawing.Size(194, 17);
  -			this.cbShowOpenModelButton.TabIndex = 0;
  +			this.cbShowOpenModelButton.TabIndex = 3;
   			this.cbShowOpenModelButton.Text = "Show &open model button on toolbar";
   			this.cbShowOpenModelButton.UseVisualStyleBackColor = true;
   			// 
  @@ -99,28 +104,79 @@
   			this.label2.AutoSize = true;
   			this.label2.Location = new System.Drawing.Point(8, 18);
   			this.label2.Name = "label2";
  -			this.label2.Size = new System.Drawing.Size(339, 13);
  +			this.label2.Size = new System.Drawing.Size(266, 13);
   			this.label2.TabIndex = 1;
  -			this.label2.Text = "Files to ignore in solution explorer (separate each file with a semi-colon)";
  +			this.label2.Text = "Files to exclude from solution explorer (case insensitive)";
   			// 
   			// txtResyncIgnoreList
   			// 
  -			this.txtResyncIgnoreList.Location = new System.Drawing.Point(11, 34);
  +			this.txtResyncIgnoreList.Location = new System.Drawing.Point(186, 37);
   			this.txtResyncIgnoreList.Name = "txtResyncIgnoreList";
  -			this.txtResyncIgnoreList.Size = new System.Drawing.Size(359, 20);
  +			this.txtResyncIgnoreList.Size = new System.Drawing.Size(166, 20);
   			this.txtResyncIgnoreList.TabIndex = 1;
  +			this.txtResyncIgnoreList.TextChanged += new System.EventHandler(this.txtResyncIgnoreList_TextChanged);
   			// 
   			// groupBox2
   			// 
  +			this.groupBox2.Controls.Add(this.cbIgnoreHiddenFiles);
  +			this.groupBox2.Controls.Add(this.btnDeleteResyncIgnoreItem);
  +			this.groupBox2.Controls.Add(this.btnAddResyncIgnoreItem);
  +			this.groupBox2.Controls.Add(this.lstResyncIgnoreList);
   			this.groupBox2.Controls.Add(this.label2);
   			this.groupBox2.Controls.Add(this.txtResyncIgnoreList);
   			this.groupBox2.Location = new System.Drawing.Point(0, 0);
   			this.groupBox2.Name = "groupBox2";
  -			this.groupBox2.Size = new System.Drawing.Size(395, 66);
  +			this.groupBox2.Size = new System.Drawing.Size(395, 151);
   			this.groupBox2.TabIndex = 2;
   			this.groupBox2.TabStop = false;
   			this.groupBox2.Text = "General";
   			// 
  +			// cbIgnoreHiddenFiles
  +			// 
  +			this.cbIgnoreHiddenFiles.AutoSize = true;
  +			this.cbIgnoreHiddenFiles.Location = new System.Drawing.Point(11, 125);
  +			this.cbIgnoreHiddenFiles.Name = "cbIgnoreHiddenFiles";
  +			this.cbIgnoreHiddenFiles.Size = new System.Drawing.Size(192, 17);
  +			this.cbIgnoreHiddenFiles.TabIndex = 4;
  +			this.cbIgnoreHiddenFiles.Text = "E&xclude hidden files and directories";
  +			this.cbIgnoreHiddenFiles.UseVisualStyleBackColor = true;
  +			// 
  +			// btnDeleteResyncIgnoreItem
  +			// 
  +			this.btnDeleteResyncIgnoreItem.Enabled = false;
  +			this.btnDeleteResyncIgnoreItem.Image = ((System.Drawing.Image)(resources.GetObject("btnDeleteResyncIgnoreItem.Image")));
  +			this.btnDeleteResyncIgnoreItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
  +			this.btnDeleteResyncIgnoreItem.Location = new System.Drawing.Point(247, 63);
  +			this.btnDeleteResyncIgnoreItem.Name = "btnDeleteResyncIgnoreItem";
  +			this.btnDeleteResyncIgnoreItem.Size = new System.Drawing.Size(65, 23);
  +			this.btnDeleteResyncIgnoreItem.TabIndex = 3;
  +			this.btnDeleteResyncIgnoreItem.Text = "&Delete";
  +			this.btnDeleteResyncIgnoreItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
  +			this.btnDeleteResyncIgnoreItem.UseVisualStyleBackColor = true;
  +			this.btnDeleteResyncIgnoreItem.Click += new System.EventHandler(this.btnDeleteResyncIgnoreItem_Click);
  +			// 
  +			// btnAddResyncIgnoreItem
  +			// 
  +			this.btnAddResyncIgnoreItem.Image = ((System.Drawing.Image)(resources.GetObject("btnAddResyncIgnoreItem.Image")));
  +			this.btnAddResyncIgnoreItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
  +			this.btnAddResyncIgnoreItem.Location = new System.Drawing.Point(186, 63);
  +			this.btnAddResyncIgnoreItem.Name = "btnAddResyncIgnoreItem";
  +			this.btnAddResyncIgnoreItem.Size = new System.Drawing.Size(55, 23);
  +			this.btnAddResyncIgnoreItem.TabIndex = 2;
  +			this.btnAddResyncIgnoreItem.Text = "&Add";
  +			this.btnAddResyncIgnoreItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
  +			this.btnAddResyncIgnoreItem.UseVisualStyleBackColor = true;
  +			this.btnAddResyncIgnoreItem.Click += new System.EventHandler(this.btnAddResyncIgnoreItem_Click);
  +			// 
  +			// lstResyncIgnoreList
  +			// 
  +			this.lstResyncIgnoreList.FormattingEnabled = true;
  +			this.lstResyncIgnoreList.Location = new System.Drawing.Point(11, 37);
  +			this.lstResyncIgnoreList.Name = "lstResyncIgnoreList";
  +			this.lstResyncIgnoreList.Size = new System.Drawing.Size(166, 82);
  +			this.lstResyncIgnoreList.TabIndex = 0;
  +			this.lstResyncIgnoreList.SelectedIndexChanged += new System.EventHandler(this.lstResyncIgnoreList_SelectedIndexChanged);
  +			// 
   			// GeneralOptionsPage
   			// 
   			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
  @@ -147,5 +203,9 @@
           private System.Windows.Forms.GroupBox groupBox2;
   		private System.Windows.Forms.CheckBox cbShowSchemaExportButton;
   		private System.Windows.Forms.CheckBox cbHideSchemaExportButton;
  +		private System.Windows.Forms.CheckBox cbIgnoreHiddenFiles;
  +		private System.Windows.Forms.Button btnDeleteResyncIgnoreItem;
  +		private System.Windows.Forms.Button btnAddResyncIgnoreItem;
  +		private System.Windows.Forms.ListBox lstResyncIgnoreList;
       }
   }
  
  
  
  1.4       +42 -2     plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.cs
  
  Index: GeneralOptionsPage.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.cs,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- GeneralOptionsPage.cs	3 May 2006 20:23:06 -0000	1.3
  +++ GeneralOptionsPage.cs	27 May 2006 15:05:59 -0000	1.4
  @@ -42,7 +42,19 @@
               cbShowOpenModelButton.Checked = m_settings.ShowOpenModelButton;
   			cbShowSchemaExportButton.Checked = m_settings.ShowSchemaExportButton;
   			cbHideSchemaExportButton.Checked = m_settings.HideSchemaExportButtonIfProjectUnavailable;
  -            txtResyncIgnoreList.Text = m_settings.ResyncIgnoreList;
  +			lstResyncIgnoreList.Items.Clear();
  +			if (m_settings.ResyncIgnoreList.Length > 0)
  +			{
  +				string[] list = m_settings.ResyncIgnoreList.Split(new char[] { ';' });
  +				foreach (string item in list)
  +				{
  +					if (item.Length > 0) lstResyncIgnoreList.Items.Add(item);
  +				}
  +			}
  +			txtResyncIgnoreList.Text = string.Empty;
  +			btnAddResyncIgnoreItem.Enabled = false;
  +			btnDeleteResyncIgnoreItem.Enabled = false;
  +			cbIgnoreHiddenFiles.Checked = m_settings.ResyncIgnoreHiddenFiles;
               UpdateState();
           }
   
  @@ -52,7 +64,13 @@
               m_settings.ShowOpenModelButton = cbShowOpenModelButton.Checked;
   			m_settings.ShowSchemaExportButton = cbShowSchemaExportButton.Checked;
   			m_settings.HideSchemaExportButtonIfProjectUnavailable = cbHideSchemaExportButton.Checked;
  -			m_settings.ResyncIgnoreList = txtResyncIgnoreList.Text;
  +			string ignoreList = string.Empty;
  +			foreach (string item in lstResyncIgnoreList.Items)
  +			{
  +				ignoreList = ignoreList + item + ";";
  +			}
  +			m_settings.ResyncIgnoreList = ignoreList;
  +			m_settings.ResyncIgnoreHiddenFiles = cbIgnoreHiddenFiles.Checked;
   		}
   
   		public void OnEnter()
  @@ -84,5 +102,27 @@
   			UpdateState();
   		}
   
  +		private void lstResyncIgnoreList_SelectedIndexChanged(object sender, EventArgs e)
  +		{
  +			btnDeleteResyncIgnoreItem.Enabled = lstResyncIgnoreList.SelectedIndex != -1;
  +		}
  +
  +		private void btnAddResyncIgnoreItem_Click(object sender, EventArgs e)
  +		{
  +			lstResyncIgnoreList.Items.Add(txtResyncIgnoreList.Text);
  +			txtResyncIgnoreList.Text = string.Empty;
  +		}
  +
  +		private void txtResyncIgnoreList_TextChanged(object sender, EventArgs e)
  +		{
  +			btnAddResyncIgnoreItem.Enabled = txtResyncIgnoreList.Text.Length > 0;
  +		}
  +
  +		private void btnDeleteResyncIgnoreItem_Click(object sender, EventArgs e)
  +		{
  +			lstResyncIgnoreList.Items.Remove(lstResyncIgnoreList.SelectedItem);
  +			lstResyncIgnoreList.SelectedIndex = -1;
  +		}
  +
       }
   }
  
  
  
  1.2       +32 -0     plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.resx
  
  Index: GeneralOptionsPage.resx
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/GeneralOptionsPage.resx,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- GeneralOptionsPage.resx	18 Apr 2006 17:18:51 -0000	1.1
  +++ GeneralOptionsPage.resx	27 May 2006 15:05:59 -0000	1.2
  @@ -117,4 +117,36 @@
     <resheader name="writer">
       <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
  +  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  +  <data name="btnDeleteResyncIgnoreItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
  +    <value>
  +        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
  +        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA
  +        CxMBAJqcGAAAAjVJREFUOE9j/P//P4O3l5fBP0aGHob/DG1MjAwHtm7d9o+BWODo6MLs7OKaDqT/Ozk7
  +        f/P28g709vFmBhmMjq1sHViCAgOU3N3d8mByDECNLECcZGfvtM3c0va/vYPLHw8Pzypfb1RDVDQNOazt
  +        nZyArv3u4OA0B24AiAE0QBKILRwcXbZZ2dj/t7N3+O/v673R19eHGyRvamHL6e7pucLW3um3qal5t5ae
  +        CQ+KATAO0BA2IC6wd3D+bWfn9N/H13eZpZW9npWV3WRbG5v/eoYmk9W0DPiRvYbhT2tbW0Z7eydNoJfO
  +        m5lb/zcyNvtuaGz0Xk1Ld52yui4nerhgGABToG9g4qCnb/LT0sr2v56+0T0FZU0hbAGL1QBjExMFNXWd
  +        S7p6hv+ABv03MbX4r6Wte4soAwyNTOXVNLSvAg34o6GpvUZETNJETl5lm4Gh8X9Vde1MvF7Q0NaVkFVQ
  +        PiWnqPofaPshSQkpIR4+Pm5+IRFueSW16QYGxl9UtQxksQaihoEFh5yi2iIJacWPOrqGT7R19bVgCnkE
  +        BDg4Obn5dPUNz0rKKEySUVSDJzR4GEjJKniLSSj8V1XT/q+iptHKyc0LTgMwzMLCzAQUV1FRUb3PKyAo
  +        r65rwgSSAysQEBBiExERaxUSFv8vr6C8i4OLR42HTwCsABkLCAgym5lZTubm5TJV1zNHGABSJCOvasTK
  +        xj6RgZHJjpmFhRdbiINtZGBgYWJi4sKaEnFpwieOMyERaxgAd/H0VrlTD2AAAAAASUVORK5CYII=
  +</value>
  +  </data>
  +  <data name="btnAddResyncIgnoreItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
  +    <value>
  +        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
  +        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA
  +        CxMBAJqcGAAAAfBJREFUOE+Nkl1IU2Ecxo/3fZhBVyEF3dRNFkgZWkGlfUCf2AcVyExaZhAFeZF1YQjG
  +        lKKCTOrCEbVSUQhWWbNlMkoG2uykKX7UbGduQyym29k589fOZBEIe/vDc/N/eX7Py/O+GYBkzPdOE6oe
  +        lSKzE1JsZkLKPTmakTwQjQEwNOQwEVd70cPNuGzrE6v5vUjSaMcxRrrM9Dp3EY860ULV2JvWcrt6BfVX
  +        soQgSbafIK550NUetNlW9N/XCI8fJyAXUnVupRjQ15aHPv0YNWhBna5BC5r4NbiDr505FBdligGuxuXY
  +        G7JpvZNNRClj6ksBZw8vZeuGxRzIXyIGpEpqrF1NaGA3/a9WsW7NIqEx5fvbcu3FTC6cyuL03mUc3Tlf
  +        Xn1LEMvzQFI3bQEqH/o5f0+hpM7H9koveZd+RNI+kwGwfoBH7+ZoeKNjaY9xo1ml6kkU8/0ZNld4xIA6
  +        I/1ZgOvWSUpv+Siu+UnR1UT6ZS85Z9zpAU/tbvQ5fYEiMY0xf4T8g+Xpf1oK4OwZxpABe909mNA35BGF
  +        bUcq/g/w7y2M9Kmwhlv2igFN7a5kqpHu+DiEYW57209Lh4fuvjEx4IHNkQRMBkOM+wJ4hv18khXef1Z4
  +        0TVAwSFBB3etL9lYWMKmfWXk7ildoC37zfwBYOvcL3dylzIAAAAASUVORK5CYII=
  +</value>
  +  </data>
   </root>
  \ No newline at end of file
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  No                   revision
  
  
  No                   revision

Thread: [Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMD

andromdaplugins-cvs