Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/Graphics error.gif info.gif issue.gif link.gif link_broken.gif ok.gif property.gif property_link.gif warning.gif
|
From: Chris M. <cm...@us...> - 2006-07-11 13:45:41
|
User: cmicali
Date: 06/07/11 06:45:40
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs AndroMDA.VS80AddIn.AddIn
AndroMDA.VS80AddIn.csproj Resource1.Designer.cs
Resource1.resx VS80AddIn.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
CreateEntityVOConvertorCommand.cs
PropertyMapperCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AboutDialog.designer.cs
AboutOptionsPage.designer.cs AboutOptionsPage.resx
ExternalToolsOptionsPage.cs
ExternalToolsOptionsPage.designer.cs
ExternalToolsOptionsPage.resx
GeneralOptionsPage.Designer.cs
GeneralOptionsPage.cs GeneralOptionsPage.resx
PropertyMapperDialog.Designer.cs
PropertyMapperDialog.cs PropertyMapperDialog.resx
ScrollableListView.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
FileUtils.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
SolutionExplorerOptionsPage.Designer.cs
SolutionExplorerOptionsPage.cs
SolutionExplorerOptionsPage.resx
WelcomeWizard.Designer.cs WelcomeWizard.cs
WelcomeWizard.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
build.properties expand.gif expandall.gif issue.gif
settings.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/Graphics error.gif
info.gif issue.gif link.gif link_broken.gif ok.gif
property.gif property_link.gif warning.gif
Removed: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AddInWelcome.Designer.cs AddInWelcome.cs
AddInWelcome.resx
Log:
- Rearranged settings pages
- New setup wizard
- Sizable dialogs
- New property mapper
- New options
Revision Changes Path
1.10 +31 -4 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.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- AddInSettings.cs 7 Jul 2006 22:32:14 -0000 1.9
+++ AddInSettings.cs 11 Jul 2006 13:45:33 -0000 1.10
@@ -51,13 +51,12 @@
UMLModellerPath = "C:\\Program Files\\MagicDraw UML Community Edition\\bin\\mduml.exe";
PassSchemaExportArguments = true;
SchemaExportCommandLine = "t t";
- Dialogs.AddInWelcome welcome = new Dialogs.AddInWelcome();
- welcome.ShowDialog();
}
else if (AddInBuild < 8)
{
SchemaExportCommandLine = "t t";
}
+
}
#endregion
@@ -70,6 +69,12 @@
set { m_settings.SetBool("AMDAFirstRun", value); }
}
+ public bool ShowWelcomeWizard
+ {
+ get { return m_settings.GetBool("AMDAShowWiz", true); }
+ set { m_settings.SetBool("AMDAShowWiz", value); }
+ }
+
public bool PromptToGenerateOnBuildIfFilesOutOfDate
{
get { return m_settings.GetBool("AMDABdPrmptO", true); }
@@ -255,6 +260,28 @@
#endregion
+ #region Context menu settings
+
+ public bool ShowPropertyMapper
+ {
+ get { return m_settings.GetBool("AMDAPrpMapE", true); }
+ set { m_settings.SetBool("AMDAPrpMapE", value); }
+ }
+
+ public bool ShowInsertEntityConversion
+ {
+ get { return m_settings.GetBool("AMDAEntConS", true); }
+ set { m_settings.SetBool("AMDAEntConS", value); }
+ }
+
+ public bool OnlyEnableCodeGenOnConversionMethods
+ {
+ get { return m_settings.GetBool("AMDACdeGenE", true); }
+ set { m_settings.SetBool("AMDACdeGenE", value); }
+ }
+
+ #endregion
+
#region Helper methods
public bool IsInIgnoreList(string fileToTest)
1.5 +5 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.AddIn
Index: AndroMDA.VS80AddIn.AddIn
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.AddIn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- AndroMDA.VS80AddIn.AddIn 7 Jul 2006 22:32:14 -0000 1.4
+++ AndroMDA.VS80AddIn.AddIn 11 Jul 2006 13:45:33 -0000 1.5
@@ -22,10 +22,14 @@
<Assembly>AndroMDA.VS80AddIn.dll</Assembly>
<FullClassName>AndroMDA.VS80AddIn.Dialogs.GeneralOptionsPage</FullClassName>
</SubCategory>
- <SubCategory Name="External Tools">
+ <SubCategory Name="Tools">
<Assembly>AndroMDA.VS80AddIn.dll</Assembly>
<FullClassName>AndroMDA.VS80AddIn.Dialogs.ExternalToolsOptionsPage</FullClassName>
</SubCategory>
+ <SubCategory Name="Solution Explorer">
+ <Assembly>AndroMDA.VS80AddIn.dll</Assembly>
+ <FullClassName>AndroMDA.VS80AddIn.Dialogs.SolutionExplorerOptionsPage</FullClassName>
+ </SubCategory>
</Category>
</ToolsOptionsPage>
1.16 +26 -15 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.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- AndroMDA.VS80AddIn.csproj 7 Jul 2006 22:32:14 -0000 1.15
+++ AndroMDA.VS80AddIn.csproj 11 Jul 2006 13:45:33 -0000 1.16
@@ -79,12 +79,6 @@
<Compile Include="Dialogs\AboutOptionsPage.designer.cs">
<DependentUpon>AboutOptionsPage.cs</DependentUpon>
</Compile>
- <Compile Include="Dialogs\AddInWelcome.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Dialogs\AddInWelcome.Designer.cs">
- <DependentUpon>AddInWelcome.cs</DependentUpon>
- </Compile>
<Compile Include="Dialogs\GeneralOptionsPage.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -119,6 +113,18 @@
<Compile Include="Dialogs\ScrollableListView.cs">
<SubType>Component</SubType>
</Compile>
+ <Compile Include="Dialogs\SolutionExplorerOptionsPage.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="Dialogs\SolutionExplorerOptionsPage.Designer.cs">
+ <DependentUpon>SolutionExplorerOptionsPage.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Dialogs\WelcomeWizard.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Dialogs\WelcomeWizard.Designer.cs">
+ <DependentUpon>WelcomeWizard.cs</DependentUpon>
+ </Compile>
<Compile Include="MavenProxy.cs" />
<Compile Include="MDAProject.cs" />
<Compile Include="MDASolutionManager.cs" />
@@ -241,10 +247,6 @@
<DependentUpon>AboutOptionsPage.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Dialogs\AddInWelcome.resx">
- <SubType>Designer</SubType>
- <DependentUpon>AddInWelcome.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="Dialogs\GeneralOptionsPage.resx">
<SubType>Designer</SubType>
<DependentUpon>GeneralOptionsPage.cs</DependentUpon>
@@ -265,6 +267,14 @@
<SubType>Designer</SubType>
<DependentUpon>PropertyMapperDialog.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="Dialogs\SolutionExplorerOptionsPage.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>SolutionExplorerOptionsPage.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Dialogs\WelcomeWizard.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>WelcomeWizard.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Resource1.resx">
<SubType>Designer</SubType>
<Generator>ResXFileCodeGenerator</Generator>
@@ -296,11 +306,15 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="AddIn.ico" />
+ <None Include="Resources\build.properties" />
<None Include="Resources\indicator_arrows.gif" />
- <None Include="Resources\arrow_right1.png" />
- <None Include="Resources\arrow_right.png" />
<None Include="Resources\link_add.png" />
+ <None Include="Resources\expand.gif" />
+ <None Include="Resources\expandall.gif" />
+ <None Include="Resources\issue.gif" />
+ <None Include="Resources\link_break.gif" />
<Content Include="Resources\mda\src\uml\empty.model.membership.xml" />
+ <None Include="Resources\settings.xml" />
<None Include="Resources\rightbox.bmp" />
<None Include="Resources\orange.bmp" />
<None Include="Resources\Common\cvsignore" />
@@ -338,9 +352,6 @@
<None Include="Resources\Web\web.config.nhibernate" />
<None Include="Resources\Web\web.config.rolesection" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="MavenProxy\" />
- </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>
<PreBuildEvent>
1.9 +56 -10 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.Designer.cs
Index: Resource1.Designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.Designer.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- Resource1.Designer.cs 7 Jul 2006 22:32:14 -0000 1.8
+++ Resource1.Designer.cs 11 Jul 2006 13:45:33 -0000 1.9
@@ -60,17 +60,12 @@
}
}
- internal static System.Drawing.Bitmap arrow_right {
- get {
- object obj = ResourceManager.GetObject("arrow_right", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap arrow_right1 {
+ /// <summary>
+ /// Looks up a localized string similar to maven.repo.remote=http://www.ibiblio.org/maven,http://team.andromda.org/maven.
+ /// </summary>
+ internal static string build_properties {
get {
- object obj = ResourceManager.GetObject("arrow_right1", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
+ return ResourceManager.GetString("build_properties", resourceCulture);
}
}
@@ -149,6 +144,20 @@
}
}
+ internal static System.Drawing.Bitmap expand {
+ get {
+ object obj = ResourceManager.GetObject("expand", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap expandall {
+ get {
+ object obj = ResourceManager.GetObject("expandall", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap indicator_arrows {
get {
object obj = ResourceManager.GetObject("indicator_arrows", resourceCulture);
@@ -156,6 +165,13 @@
}
}
+ internal static System.Drawing.Bitmap issue {
+ get {
+ object obj = ResourceManager.GetObject("issue", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
internal static byte[] lib_AndroMDA_NHibernateSupport_dll {
get {
object obj = ResourceManager.GetObject("lib_AndroMDA_NHibernateSupport_dll", resourceCulture);
@@ -233,6 +249,13 @@
}
}
+ internal static System.Drawing.Bitmap link_break {
+ get {
+ object obj = ResourceManager.GetObject("link_break", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to <project default="mda"
/// xmlns:ant="jelly:ant"
@@ -665,6 +688,29 @@
}
/// <summary>
+ /// Looks up a localized string similar to <settings>
+ /// <profiles>
+ /// <profile>
+ /// <id>andromda</id>
+ /// <repositories>
+ /// <repository>
+ /// <id>andromda</id>
+ /// <name>AndroMDA</name>
+ /// <url>http://galaxy.andromda.org/maven2</url>
+ /// <layout>default</layout>
+ /// <snapshots>
+ /// <enabled>false</enabled>
+ /// </snapshots>
+ /// </repository>
+ /// <repo [rest of string was truncated]";.
+ /// </summary>
+ internal static string settings_xml {
+ get {
+ return ResourceManager.GetString("settings_xml", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to *.dll
///*.pdb.
/// </summary>
1.9 +35 -23 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.resx
Index: Resource1.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.resx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- Resource1.resx 7 Jul 2006 22:32:14 -0000 1.8
+++ Resource1.resx 11 Jul 2006 13:45:33 -0000 1.9
@@ -118,6 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="build_properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\build.properties;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
<data name="web_web_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\web.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
@@ -151,29 +154,23 @@
<data name="lib_Castle_DynamicProxy_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\Castle.DynamicProxy.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="lib_log4net_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\log4net.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="orange" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\orange.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="indicator_arrows" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\indicator_arrows.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="Membership_UserDaoImpl_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Membership\UserDaoImpl.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="arrow_right1" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\arrow_right1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="web_web_config_rolesection" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Web\web.config.rolesection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="expand" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\expand.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mda_conf_andromda_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\conf\andromda.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="Membership_DomainRoleProvider_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Membership\DomainRoleProvider.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="settings_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\settings.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="web_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -190,8 +187,8 @@
<data name="lib_Iesi_Collections_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\Iesi.Collections.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="lib_log4net_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\log4net.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="link_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\link_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="lib_AndroMDA_NHibernateSupport_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\AndroMDA.NHibernateSupport.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -214,24 +211,39 @@
<data name="common_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Common\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name="issue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\issue.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="expandall" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\expandall.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="web_web_config_membershipsection" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\web.config.membershipsection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="mda_src_uml_empty_model_membership_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\src\uml\empty.model.membership.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="web_bin_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Web\Bin\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="core_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Core\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="lib_HashCodeProvider_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\HashCodeProvider.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="mda_maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="common_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Common\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="web_web_config_rolesection" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\web.config.rolesection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="web_bin_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\Bin\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="rightbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\rightbox.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -241,19 +253,19 @@
<data name="lib_NHibernate_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\NHibernate.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="arrow_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="lib_HashCodeProvider_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\HashCodeProvider.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="indicator_arrows" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\indicator_arrows.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="web_web_config_nhibernate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\web.config.nhibernate;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name="Membership_DomainRoleProvider_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\DomainRoleProvider.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
<data name="mda_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="link_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\link_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="link_break" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\link_break.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
1.12 +8 -0 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.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- VS80AddIn.cs 7 Jul 2006 22:32:14 -0000 1.11
+++ VS80AddIn.cs 11 Jul 2006 13:45:33 -0000 1.12
@@ -128,6 +128,14 @@
foreach (string sw in new string[] { "/build", "/rebuild", "/clean", "/deploy" }) { if (command_line.IndexOf(sw) != -1) return; }
m_addInSettings = new AddInSettings(m_applicationObject);
+
+ if (m_addInSettings.ShowWelcomeWizard)
+ {
+ Dialogs.WelcomeWizard welcome = new Dialogs.WelcomeWizard(m_addInSettings);
+ welcome.ShowDialog();
+ m_addInSettings.ShowWelcomeWizard = welcome.ShowWizardAgain;
+ }
+
m_solutionManager = new MDASolutionManager(m_applicationObject, m_addInSettings);
BindEvents();
CreateCommands();
1.4 +3 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/CreateEntityVOConvertorCommand.cs
Index: CreateEntityVOConvertorCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/CreateEntityVOConvertorCommand.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- CreateEntityVOConvertorCommand.cs 7 Jul 2006 22:32:15 -0000 1.3
+++ CreateEntityVOConvertorCommand.cs 11 Jul 2006 13:45:34 -0000 1.4
@@ -138,7 +138,7 @@
public override void QueryStatus(string commandName, vsCommandStatusTextWanted neededText, ref vsCommandStatus status, ref object commandText)
{
- if (m_solutionManager.IsEnabled && m_application.ActiveDocument != null && m_application.ActiveDocument.Name.Contains("DaoImpl"))
+ if (m_solutionManager.IsEnabled && m_addInSettings.ShowInsertEntityConversion && m_application.ActiveDocument != null && m_application.ActiveDocument.Name.Contains("DaoImpl"))
{
status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;
if (IsCommandAvailable(false))
@@ -170,7 +170,8 @@
// The return type does not equal the parameter type
currentMethod.Parameters.Item(1).FullName != currentMethod.Type.AsFullName &&
// And it's name is either ends with ToEntity or begins with To
- (currentMethod.Name.EndsWith("ToEntity") || currentMethod.Name.StartsWith("To"))
+ ((currentMethod.Name.EndsWith("ToEntity") || currentMethod.Name.StartsWith("To"))
+ || !m_addInSettings.OnlyEnableCodeGenOnConversionMethods)
)
{
if (!fullCheck) return true;
1.2 +4 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/PropertyMapperCommand.cs
Index: PropertyMapperCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/PropertyMapperCommand.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- PropertyMapperCommand.cs 7 Jul 2006 22:32:15 -0000 1.1
+++ PropertyMapperCommand.cs 11 Jul 2006 13:45:34 -0000 1.2
@@ -22,7 +22,7 @@
public PropertyMapperCommand()
{
- Init("PropertyMapper", "Run Property Mapper", "Run the property mapper", 240, VisibilityType.AlwaysEnabled);
+ Init("PropertyMapper", "Run Property Mapper", "Run the property mapper", 450, VisibilityType.AlwaysEnabled);
m_isStartOfGroup = true;
m_autoAddToCodeContextMenu = true;
m_autoAddToToolbar = false;
@@ -49,7 +49,7 @@
public override void QueryStatus(string commandName, vsCommandStatusTextWanted neededText, ref vsCommandStatus status, ref object commandText)
{
- if (m_solutionManager.IsEnabled && m_application.ActiveDocument != null && m_application.ActiveDocument.Name.Contains("DaoImpl"))
+ if (m_solutionManager.IsEnabled && m_addInSettings.ShowPropertyMapper && m_application.ActiveDocument != null && m_application.ActiveDocument.Name.Contains("DaoImpl"))
{
status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;
if (IsCommandAvailable(false))
@@ -81,7 +81,8 @@
// The return type does not equal the parameter type
currentMethod.Parameters.Item(1).FullName != currentMethod.Type.AsFullName &&
// And it's name is either ends with ToEntity or begins with To
- (currentMethod.Name.EndsWith("ToEntity") || currentMethod.Name.StartsWith("To"))
+ ((currentMethod.Name.EndsWith("ToEntity") || currentMethod.Name.StartsWith("To"))
+ || !m_addInSettings.OnlyEnableCodeGenOnConversionMethods)
)
{
if (!fullCheck) return true;
1.5 +56 -42 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- AboutDialog.designer.cs 4 Jun 2006 02:06:01 -0000 1.4
+++ AboutDialog.designer.cs 11 Jul 2006 13:45:34 -0000 1.5
@@ -29,13 +29,16 @@
private void InitializeComponent()
{
this.button1 = new System.Windows.Forms.Button();
+ this.panel1 = new System.Windows.Forms.Panel();
this.aboutOptionsPage1 = new AndroMDA.VS80AddIn.Dialogs.AboutOptionsPage();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
//
// button1
//
+ this.button1.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.button1.BackColor = System.Drawing.SystemColors.Control;
- this.button1.Location = new System.Drawing.Point(155, 347);
+ this.button1.Location = new System.Drawing.Point(155, 8);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(84, 25);
this.button1.TabIndex = 2;
@@ -43,14 +46,23 @@
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
+ // panel1
+ //
+ this.panel1.Controls.Add(this.button1);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel1.Location = new System.Drawing.Point(0, 341);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(394, 40);
+ this.panel1.TabIndex = 3;
+ //
// aboutOptionsPage1
//
- this.aboutOptionsPage1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.aboutOptionsPage1.Dock = System.Windows.Forms.DockStyle.Fill;
this.aboutOptionsPage1.Location = new System.Drawing.Point(0, 0);
this.aboutOptionsPage1.Name = "aboutOptionsPage1";
this.aboutOptionsPage1.Size = new System.Drawing.Size(394, 341);
this.aboutOptionsPage1.SolutionManager = null;
- this.aboutOptionsPage1.TabIndex = 1;
+ this.aboutOptionsPage1.TabIndex = 4;
//
// AboutDialog
//
@@ -59,21 +71,23 @@
this.BackColor = System.Drawing.SystemColors.Control;
this.ClientSize = new System.Drawing.Size(394, 381);
this.ControlBox = false;
- this.Controls.Add(this.button1);
this.Controls.Add(this.aboutOptionsPage1);
+ this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Name = "AboutDialog";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "About AndroMDA Add-In";
this.Shown += new System.EventHandler(this.AboutDialog_Shown);
this.Load += new System.EventHandler(this.AboutDialog_Load);
+ this.panel1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
- private AboutOptionsPage aboutOptionsPage1;
private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.Panel panel1;
+ private AboutOptionsPage aboutOptionsPage1;
}
}
\ No newline at end of file
1.8 +287 -279 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- AboutOptionsPage.designer.cs 15 Jun 2006 03:29:32 -0000 1.7
+++ AboutOptionsPage.designer.cs 11 Jul 2006 13:45:34 -0000 1.8
@@ -89,6 +89,7 @@
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Black;
+ this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
this.pictureBox1.Name = "pictureBox1";
@@ -111,11 +112,15 @@
//
// tabControl1
//
+ this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.ImageList = this.imageList1;
- this.tabControl1.Location = new System.Drawing.Point(0, 99);
+ this.tabControl1.Location = new System.Drawing.Point(0, 101);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(395, 239);
@@ -126,10 +131,10 @@
//
this.tabPage1.Controls.Add(this.listViewStatus);
this.tabPage1.ImageIndex = 2;
- this.tabPage1.Location = new System.Drawing.Point(4, 23);
+ this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(387, 212);
+ this.tabPage1.Size = new System.Drawing.Size(387, 209);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "Status";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -139,13 +144,14 @@
this.listViewStatus.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader3,
this.columnHeader4});
+ this.listViewStatus.Dock = System.Windows.Forms.DockStyle.Fill;
this.listViewStatus.FullRowSelect = true;
this.listViewStatus.GridLines = true;
this.listViewStatus.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.listViewStatus.Location = new System.Drawing.Point(1, 3);
+ this.listViewStatus.Location = new System.Drawing.Point(3, 3);
this.listViewStatus.MultiSelect = false;
this.listViewStatus.Name = "listViewStatus";
- this.listViewStatus.Size = new System.Drawing.Size(385, 208);
+ this.listViewStatus.Size = new System.Drawing.Size(381, 203);
this.listViewStatus.TabIndex = 7;
this.listViewStatus.UseCompatibleStateImageBehavior = false;
this.listViewStatus.View = System.Windows.Forms.View.Details;
@@ -158,17 +164,17 @@
// columnHeader4
//
this.columnHeader4.Text = "Value";
- this.columnHeader4.Width = 224;
+ this.columnHeader4.Width = 199;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.pnlGenerating);
this.tabPage3.Controls.Add(this.listViewStatistics);
this.tabPage3.ImageIndex = 0;
- this.tabPage3.Location = new System.Drawing.Point(4, 23);
+ this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage3.Size = new System.Drawing.Size(387, 212);
+ this.tabPage3.Size = new System.Drawing.Size(387, 209);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "Statistics";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -179,13 +185,15 @@
this.pnlGenerating.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.pnlGenerating.Controls.Add(this.label3);
this.pnlGenerating.Controls.Add(this.pictureBox2);
- this.pnlGenerating.Location = new System.Drawing.Point(1, 3);
+ this.pnlGenerating.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pnlGenerating.Location = new System.Drawing.Point(3, 3);
this.pnlGenerating.Name = "pnlGenerating";
- this.pnlGenerating.Size = new System.Drawing.Size(385, 208);
+ this.pnlGenerating.Size = new System.Drawing.Size(381, 203);
this.pnlGenerating.TabIndex = 7;
//
// label3
//
+ this.label3.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.Location = new System.Drawing.Point(121, 127);
@@ -196,14 +204,12 @@
//
// pictureBox2
//
- this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.pictureBox2.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.pictureBox2.BackColor = System.Drawing.Color.White;
this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
this.pictureBox2.Location = new System.Drawing.Point(147, 41);
this.pictureBox2.Name = "pictureBox2";
- this.pictureBox2.Size = new System.Drawing.Size(87, 81);
+ this.pictureBox2.Size = new System.Drawing.Size(83, 76);
this.pictureBox2.TabIndex = 8;
this.pictureBox2.TabStop = false;
//
@@ -212,6 +218,7 @@
this.listViewStatistics.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1,
this.columnHeader2});
+ this.listViewStatistics.Dock = System.Windows.Forms.DockStyle.Fill;
this.listViewStatistics.FullRowSelect = true;
this.listViewStatistics.GridLines = true;
listViewGroup1.Header = "Code Statistics";
@@ -222,10 +229,10 @@
listViewGroup1,
listViewGroup2});
this.listViewStatistics.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.listViewStatistics.Location = new System.Drawing.Point(1, 3);
+ this.listViewStatistics.Location = new System.Drawing.Point(3, 3);
this.listViewStatistics.MultiSelect = false;
this.listViewStatistics.Name = "listViewStatistics";
- this.listViewStatistics.Size = new System.Drawing.Size(385, 208);
+ this.listViewStatistics.Size = new System.Drawing.Size(381, 203);
this.listViewStatistics.TabIndex = 6;
this.listViewStatistics.UseCompatibleStateImageBehavior = false;
this.listViewStatistics.View = System.Windows.Forms.View.Details;
@@ -244,10 +251,10 @@
//
this.tabPage2.Controls.Add(this.panel1);
this.tabPage2.ImageIndex = 1;
- this.tabPage2.Location = new System.Drawing.Point(4, 23);
+ this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(387, 212);
+ this.tabPage2.Size = new System.Drawing.Size(387, 209);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "About";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -258,9 +265,10 @@
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Controls.Add(this.label8);
this.panel1.Controls.Add(this.linkLabel2);
- this.panel1.Location = new System.Drawing.Point(1, 3);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel1.Location = new System.Drawing.Point(3, 3);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(385, 208);
+ this.panel1.Size = new System.Drawing.Size(381, 203);
this.panel1.TabIndex = 5;
//
// label8
1.6 +65 -65 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- AboutOptionsPage.resx 15 Jun 2006 03:29:32 -0000 1.5
+++ AboutOptionsPage.resx 11 Jul 2006 13:45:34 -0000 1.6
@@ -936,82 +936,82 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACK
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACI
EQAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
- AwABEAMAAQEBAAEgBgABEBoAAYECEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/
- AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW4CEAH/AbcCEAH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC
- AZkBVgICAa0BVQICAa4BUgICAaIBRAIBAXcBJwIBATgBDAIBAQ4BAgMBDAABBwIBAQgBTwICAZkBZAIK
+ AwABEAMAAQEBAAEgBgABEBoAAYECEgH/AW8CEgH/AW8CEgH/AW8CEgH/AW8CEgH/AW8CEgH/AW8CEgH/
+ AW8CEgH/AW8CEgH/AW8CEgH/AW8CEgH/AXACEgH/AbcCEgH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC
+ AZkBVgICAa0BVQICAa4BUgICAaIBRAIBAXcBJwIBATgBDAIBAQ4BAgMBDAABBwIBAQgBTwICAZkBZAIH
AeQBWwICAb0BSwICAYwBPAIBAWQBJQIBATUBHAIBASYBRQIBAXsBVgICAa8BUgICAaUBQwIBAXMBGgIB
ASIBAgMBTAAB7AHaAdMC/wHoAdYC/wHmAdIC/wHlAc4C/wHiAcoC/wHhAcYC/wHgAcMC/wHdAb8C/wHc
- AbsC/wHaAbgC/wHZAbMB/wGLAWYBYgH/AbMCEAH/DAABCgIBAQwBMwIBAU8BvgGTAYsB/AH0AegB4wH/
+ AbsC/wHaAbgC/wHZAbMB/wGLAWgBZAH/AbMCEgH/DAABCgIBAQwBMwIBAU8BugGLAYMB/AH0AegB4wH/
AvQB8wH/AfAB8gHzAf8B8QHyAfMB/wH0Ae0B6QH/Ae4B2wHQAf8BYgIDAdQBQQIBAXABFAIBARkBAgMB
- CAABXgIDAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0ASQBHgHzAbYCYQH9Af8CxgL/AtoC/wLp
+ CAABXgIDAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0AR0BHAHzAbYCXQH9Af8CxgL/AtoC/wLp
Af8ByAKpAf8BVwICAbYBKQIBATwBAgMBSAAB4gHZAdIC/wHqAdUC/wHoAc8C/wHlAcoC/wHiAcQC/wHe
- Ab8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAWQBaAH/AbMCEAH/CAABCQIBAQoBRQIB
- AXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAYEB/wHCAYEBYgH/AcwBjwGBAf8B3wHOAcQB/wHt
- AfAB8gH/AfYC9AH/AY4BSQFGAfgBRgIBAX0BEgIBARYBAgMBBAADtwH/AcECwgL/AfYB7gH/AUkBrAFC
+ Ab8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAWYBagH/AbMCEgH/CAABCQIBAQoBRQIB
+ AXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAYEB/wHCAYEBZAH/AcwBjwGBAf8B3wHOAcQB/wHt
+ AfAB8gH/AfYC9AH/AYoBQgE+AfgBRgIBAX0BEgIBARYBAgMBBAADtwH/AcECwgL/AfYB7gH/AUsBrAFE
Af8BsAHZAaUB/wHvAcYBjQH/AccCgQL/AqEC/wKyAv8CxAL/AtQC/wL+Af8B8QLqAf8BVwICAbEBGAIB
AR9IAAHkAd0B1gL/Ae0B2wL/AeoB1gL/AegB0QL/AeoBxwH/AcEBugHSAv8B5wG+Av8B3gG7Av8B2wG2
- Av8B2AGxAv8B1wGpAf8BiwFmAWkB/wGzAhAB/wgAATACAQFKAfcB8QHtAf8B8AH0AfUB/wHIAYEBbQH/
- Ab8BawE6Af8BwgF2AUgB/wHsAe4B7wH/AdIBiAFzAf8BwAFuAT0B/wG9AXABQgH/AeoB6QHoAf8B9QH2
- AfcB/wF2ARkBGAHxATsCAQFgAQgCAQEJBAADvwH/AtkB2gL/Ae4B3wH/ARcBsAEoAf8BIAGtASsB/wFO
- AYEBOQL/ArUC/wKeAv8CoAL/AbEBsAL/AcUBwwn/AbEChQH+AUACAQFtSAAB5gHgAdsC/wHzAeYC/wHz
- AeYC/wHuAb4B/wE0AVAB7wH/ARABQwL/AXABfwHgAv8B3gG9Av8B3gG9Av8B3gG9Av8B3gG9Af8BjgFp
- AWoB/wGzAhAB/wgAAfEB3gHTAf8B9AL2Af8BxAF+AVMB/wHFAXMBQgH/AcsBdgFDAf8BwAF/AVcB/wH+
- A/8B2QGoAY8B/wHKAXUBQwH/AccBcwFBAf8BvAFoATYB/wHuAe8B8AH/AfYB7gHqAf8BWAICAboBHAIB
- ASUEAAPLAf8B2wLcAv8B5gHOAf8BNAHMAVQB/wEtAb4BQQH/AaYBiAGBAv8CwwL/ArAC/wHRAdkB/wH4
- AbEBzAL/AecG/wH9AfwB/QH/AfwC+wH/AVMCAgGkSAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/ARABOAL/
- ARABOQL/ASEBUAL/ARABOgL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgFqAWsB/wGzAhAB/wQA
- ATECAQFLAfkB+gH5Af8B4QHBAbEB/wHGAXMBQgH/AcwBdwFFAf8BzAF3AUQB/wHMAXYBQgH/AcoBcAE7
- Af8BywFzAT8B/wHMAXYBQwH/AcsBdgFEAf8BxwF0AUIB/wHGAYEBXQH/AfMC9QH/AbkBigF/AfwBNAIB
- AVIEAAPPAf8B3wHgAeIC/wHdAbwB/wFSAeoBgQH/AT8B0wFcAf8BywGcAZ8C/wLNAv8CwwL/AfQB/AH/
+ Av8B2AGxAv8B1wGpAf8BiwFoAWsB/wGzAhIB/wgAATACAQFKAfcB8QHtAf8B8AH0AfUB/wHIAYEBbwH/
+ Ab8BbQE8Af8BwgF4AUoB/wHsAe4B7wH/AdIBiAF1Af8BwAFwAT8B/wG9AXIBRAH/AeoB6QHoAf8B9QH2
+ AfcB/wF2ARcBFgHxATsCAQFgAQgCAQEJBAADvwH/AtkB2gL/Ae4B3wH/ARkBsAEqAf8BIgGtAS0B/wFQ
+ AYEBOwL/ArUC/wKeAv8CoAL/AbEBsAL/AcUBwwn/Aa8CgQH+AUACAQFtSAAB5gHgAdsC/wHzAeYC/wHz
+ AeYC/wHuAb4B/wE2AVIB7wH/ARIBRQL/AXIBgQHgAv8B3gG9Av8B3gG9Av8B3gG9Av8B3gG9Af8BjgFr
+ AWwB/wGzAhIB/wgAAfEB3gHTAf8B9AL2Af8BxAGAAVUB/wHFAXUBRAH/AcsBeAFFAf8BwAGBAVkB/wH+
+ A/8B2QGoAY8B/wHKAXcBRQH/AccBdQFDAf8BvAFqATgB/wHuAe8B8AH/AfYB7gHqAf8BWAICAboBHAIB
+ ASUEAAPLAf8B2wLcAv8B5gHOAf8BNgHMAVYB/wEvAb4BQwH/AaYBiAGBAv8CwwL/ArAC/wHRAdkB/wH4
+ AbEBzAL/AecG/wH9AfwB/QH/AfwC+wH/AVMCAgGkSAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/ARIBOgL/
+ ARIBOwL/ASMBUgL/ARIBPAL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgFsAW0B/wGzAhIB/wQA
+ ATECAQFLAfkB+gH5Af8B4QHBAbEB/wHGAXUBRAH/AcwBeQFHAf8BzAF5AUYB/wHMAXgBRAH/AcoBcgE9
+ Af8BywF1AUEB/wHMAXgBRQH/AcsBeAFGAf8BxwF2AUQB/wHGAYEBXwH/AfMC9QH/AbUBggF7AfwBNAIB
+ AVIEAAPPAf8B3wHgAeIC/wHdAbwB/wFUAeoBgQH/AUEB0wFeAf8BywGcAZ8C/wLNAv8CwwL/AfQB/AH/
AaICzAH/Aa0BggGBAf8B9wHzAfIB/wHrAeIB3wH/AfAB6QHlAf8BWgIDAcJIAAHrAeYB4wL/AeUByQH/
- AWUBgAHzAf8BNAFaAv8B/AHkAbkC/wHpAbIB/wEQATcC/wEsAU8B8wL/AdwBrAL/AdUBrAL/Ad4BuQH/
- AY8BawFtAf8BswIQAf8EAAFqAggB4QH6Af0B/gH/AcYBdgFGAf8BzQF4AUYB/wHNAXgBRQH/AcwBdgFD
- Af8BxwF3AUcF/wHaAZEBewH/AcwBdgFDAf8BzAF3AUQB/wHLAXYBRAH/AcEBbAE4Af8D8QH/AfIB3wHV
- Af8BRAIBAXcEAAPSAf8B4wHmAegC/wHXAaoB/wFNAcIB4AH/AVkBswL/AZ0BgQGOAv8CygL/AtYC/wH1
+ AWcBgQHzAf8BNgFcAv8B/AHkAbkC/wHpAbIB/wESATkC/wEuAVEB8wL/AdwBrAL/AdUBrAL/Ad4BuQH/
+ AY8BbQFvAf8BswISAf8EAAFqAgUB4QH6Af0B/gH/AcYBeAFIAf8BzQF6AUgB/wHNAXoBRwH/AcwBeAFF
+ Af8BxwF5AUkF/wHaAZEBfQH/AcwBeAFFAf8BzAF5AUYB/wHLAXgBRgH/AcEBbgE6Af8D8QH/AfIB3wHV
+ Af8BRAIBAXcEAAPSAf8B4wHmAegC/wHXAaoB/wFPAcIB4AH/AVsBswL/AZ0BgQGOAv8CygL/AtYC/wH1
Av8BywGhAZ4B/wHdAZQBmAL/AcUBxgL/ArIC/wLKAf8BWwICAb1IAAHtAeoB5wL/AecBzgL/AeQBwgL/
- AeMBvgL/Ad4BvQL/AdwBugH/AqUB2QH/ARABQAL/AcYBswG8Av8B1wGvAv8B4QG+Af8BkwFtAW8B/wGz
- AhAB/wQAAdABswGsAv4D/wHKAXUBQgH/AdABewFIAf8BzAF2AUMB/wHMAXYBQwH/AcwBcwE/Af8B5AHq
- AewB/wH6AfEB7AH/AcoBcAE8Af8BzAF2AUMB/wHNAXgBRQH/AcgBdAFCAf8B6wHbAdMB/wH1AekB4wH/
- AUgCAgGCBAAB1wHTAcsB/wHyAbgBcgL/Ac8BnAH/AbABuwHFAf8BgQG2AeMB/wFRAWIBow7/AcsB6AL/
+ AeMBvgL/Ad4BvQL/AdwBugH/AqUB2QH/ARIBQgL/AcYBswG8Av8B1wGvAv8B4QG+Af8BkwFvAXEB/wGz
+ AhIB/wQAAcwBrwGoAv4D/wHKAXcBRAH/AdABfQFKAf8BzAF4AUUB/wHMAXgBRQH/AcwBdQFBAf8B5AHq
+ AewB/wH6AfEB7AH/AcoBcgE+Af8BzAF4AUUB/wHNAXoBRwH/AcgBdgFEAf8B6wHbAdMB/wH1AekB4wH/
+ AUgCAgGCBAAB1wHTAcsB/wHyAbgBdAL/Ac8BnAH/AbABuwHFAf8BgQG2AeMB/wFTAWQBow7/AcsB6AL/
AckB2AL/ApwC/wKgAf8B/QKyAf8BQwIBAXVIAAHvAe0B6wL/AegB0QL/AeEBwwL/AeABwAL/Ad8BvgL/
- Ad0BuwL/AeUBtQH/ARsBRQL/ARABNwP/Ad4BvQL/AeQBxAH/AZQBbwFxAf8BswIQAf8EAAHwAdwB0QX/
- AdIBfAFJAf8B0wF+AUsB/wHMAXYBQwH/AcwBdgFDAf8BzAF2AUMB/wHFAXgBSQH/AfYB+QH7Af8B+wHx
- Ae0B/wHLAXIBPQH/Ac8BeQFHAf8BzAF4AUYB/wHuAdsB0gH/AfcB7AHlAf8BRgIBAXwEAAHbAcEBnQH/
- AeIBqAFvAv8BxwGKAv8ByQGPAv8ByQGOAv8ByQGQAf8BvgGgAaQG/wL+Av8CzwL/AsMC/wKxAv8CngH/
- AbkCXgH9ARUCAQEbSAAB8gLxAv8B5wHRAv8B4AHAAv8B3wG/Av8B3QG8Av8B3AG6Av8B2wG4Af8B7QHW
- Ab8B/wEQAT0C/wFwAXsB2wL/AeYByQH/AZgBcQFzAf8BswIQAf8EAAGKAT0BOwH1BP8B3wGBAVYB/wHb
- AYEBVAH/Ac4BeAFFAf8BywFxATwB/wHLAXQBQAH/AcwBdgFDAf8BxAGBAVwF/wHcAZQBgAH/AdIBfQFL
- Af8BzwF5AUYB/wH7AfUB8wH/AfUB5AHcAf8BOgIBAV8EAAHbAccBsgH/A9kC/wG6AXEC/wG7AXQC/wG8
- AXcC/wG9AXkB/wH5AboBdgH/AcUBqwGtAv8C9wL/AuEC/wLQAv8CxgH/AdICjwH/AR8CAQEqAQIDAUgA
- AfQC8wL/AeIBxgL/AdcBsQL/AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AVYBcgHzAf8B/AHd
- AaUC/wHpAc8B/wGaAXEBcwH/AbMCEAH/BAABSAICAYAE/wH7AckBrgH/Ae4BigFnAf8B0gGBAVgB/wHx
- AfYB+QH/AesBwgGuAf8BywFzAT8B/wHKAYABUwX/Ad8BpQGJAf8B3AGBAVUB/wHYAYEBVAX/Ac4BsQGq
- Af4BIwIBATEEAAPRAf8BxwHKAc0B/wH+Aa0BRgH/AfMB8QHvAf8B8gHWAaoB/wH0Ab8BfgH/AfoBrgFO
- Av8BqAEvAf8ByAGBAUoB/wG+AZEBhQH/AbICcQH9AVsCAgG4ARQCAQEZUAAC9gH1Av8B4QHCAv8B1gGs
- Av8B1QGrAv8B1QGrAv8B1AGpAv8B1AGpAv8B0wGoAv8B1QGmAv8B0QGkAv8B7QHWAf8BnAFvAXAB/wGz
- AhAB/wgAAfYB6AHgBv8BowF+Af8B+gGVAXEB/wHNAcYBwwX/AfwB9QHxBf8B9gH7Af0B/wHmAYMBYgH/
- AesBgwFfAf8B/QH1Ae4B/wH+AvwB/wFNAgIBkwEMAgEBDgQAA+gB/wHqAusB/wHNAbQBtQH/AecC3AH/
- AfUC9wH/Ae8C8QH/AeoB7AHtAf8B4QHkAeYB/wHbAd8B5QH/AdYB2AHaAf8BtwGoAaEB/gFrAhAB6QEX
+ Ad0BuwL/AeUBtQH/AR0BRwL/ARIBOQP/Ad4BvQL/AeQBxAH/AZQBcQFzAf8BswISAf8EAAHwAdwB0QX/
+ AdIBfgFLAf8B0wGAAU0B/wHMAXgBRQH/AcwBeAFFAf8BzAF4AUUB/wHFAXoBSwH/AfYB+QH7Af8B+wHx
+ Ae0B/wHLAXQBPwH/Ac8BewFJAf8BzAF6AUgB/wHuAdsB0gH/AfcB7AHlAf8BRgIBAXwEAAHbAcEBnQH/
+ AeIBqAFxAv8BxwGKAv8ByQGPAv8ByQGOAv8ByQGQAf8BvgGgAaQG/wL+Av8CzwL/AsMC/wKxAv8CngH/
+ AbkCWgH9ARUCAQEbSAAB8gLxAv8B5wHRAv8B4AHAAv8B3wG/Av8B3QG8Av8B3AG6Av8B2wG4Af8B7QHW
+ Ab8B/wESAT8C/wFyAX0B2wL/AeYByQH/AZgBcwF1Af8BswISAf8EAAGGATYBNQH1BP8B3wGBAVgB/wHb
+ AYEBVgH/Ac4BegFHAf8BywFzAT4B/wHLAXYBQgH/AcwBeAFFAf8BxAGBAV4F/wHcAZQBgQH/AdIBfwFN
+ Af8BzwF7AUgB/wH7AfUB8wH/AfUB5AHcAf8BOgIBAV8EAAHbAccBsgH/A9kC/wG6AXMC/wG7AXYC/wG8
+ AXkC/wG9AXsB/wH5AboBeAH/AcUBqwGtAv8C9wL/AuEC/wLQAv8CxgH/AdICjwH/AR8CAQEqAQIDAUgA
+ AfQC8wL/AeIBxgL/AdcBsQL/AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AVgBdAHzAf8B/AHd
+ AaUC/wHpAc8B/wGaAXMBdQH/AbMCEgH/BAABSAICAYAE/wH7AckBrgH/Ae4BigFpAf8B0gGBAVoB/wHx
+ AfYB+QH/AesBwgGuAf8BywF1AUEB/wHKAYEBVQX/Ad8BpQGJAf8B3AGBAVcB/wHYAYEBVgX/AcoBrQGm
+ Af4BIwIBATEEAAPRAf8BxwHKAc0B/wH+Aa0BSAH/AfMB8QHvAf8B8gHWAaoB/wH0Ab8BgAH/AfoBrgFQ
+ Av8BqAExAf8ByAGBAUwB/wG+AZEBhQH/AbICbQH9AVsCAgG4ARQCAQEZUAAC9gH1Av8B4QHCAv8B1gGs
+ Av8B1QGrAv8B1QGrAv8B1AGpAv8B1AGpAv8B0wGoAv8B1QGmAv8B0QGkAv8B7QHWAf8BnAFxAXIB/wGz
+ AhIB/wgAAfYB6AHgBv8BowGAAf8B+gGVAXMB/wHNAcYBwwX/AfwB9QHxBf8B9gH7Af0B/wHmAYMBZAH/
+ AesBgwFhAf8B/QH1Ae4B/wH+AvwB/wFNAgIBkwEMAgEBDgQAA+gB/wHqAusB/wHNAbQBtQH/AecC3AH/
+ AfUC9wH/Ae8C8QH/AeoB7AHtAf8B4QHkAeYB/wHbAd8B5QH/AdYB2AHaAf8BtQGkAZ0B/gFrAg4B6QEX
AgEBHVAAAvgB9Qr/Af4D/wH7AfkC/wH5AfQC/wH2Ae8C/wH0AeoC/wHzAeYB/wH7AfAB4wL/AfEB1wH/
- AZ8BawFsAf8BsAIQAf8IAAFKAgIBhgn/AdABnAL/AbsBhwH/AekBvwGqAf8B1wHHAcAB/wHfAckBvwH/
- AfwBqQGBAv8BpAF/Av8B6AHXBf8BvgGUAYsB/AEeAgEBKAEDAgEBAgEEAgEBBAHfAt4B/wHdAcsBvAH/
- AbYBgQF/Af8BqwKBAf8BsAKBAf8BswKBAf8BuwGEAYUB/wHKAp8B/wHqAuwB/wHpAuoB/wGMAlMB+AEn
- AgEBOFQAAfoB+QH3Dv8C/gL/AfsB+AL/AfkB9AL/AfYB7gH/Ae4B3wHaAf8B8QGYATIB/wHeAYEBHAH/
- AboBiQGBAf8BygIQAf8IAAECAwEBYAIDAdMK/wHtAv8B+wHRAv8B7wG7Av8B5AGxAv8B6wHNCf8B0QG0
- Aa0B/gEjAgEBMQEEAgEBBAQAATwCAQFkAfUB+QH+Af8B/QHDAYEC/wHMAZcC/wHNAZ8C/wHPAakC/wHR
- AbEB/wH9AcoBtgH/AfMBwQG3Av8C2wL/AuQB/wHvAugB/wFGAgEBfAEDAgEBA1AAAf0B+gH4Ev8C/gL/
- AfwB+QL/AfkB9AH/Ae8B4QHcAv8BzwGBAf8BugGJAYEB/wHKAhAB/xAAAQIDAQFGAgEBewH1AeYB3hX/
- AfoB8QHsAf8BbAEPAQ4B6QEYAgEBHwEDAgEBAwgAAUsCAgGLAf4BtwFrAf8B/gHLAZYC/wHMAZ8C/wHO
- AagC/wHOAbAC/wHOAbgC/wHNAcAB/wHWAakBpgH+AXUCGgHrAf8C/QX/AUwCAgGOAQgCAQEJUAAB9wHS
- Aa8B/wHyAcsBqwH/AeoBxAGnAf8B4QG7AaIB/wHZAbMBnQH/AdABqgGYAf8BygGkAZQB/wHIAaIBkwH/
- AcgBogGTAf8BugGJAYEB/wHKAhAB/yAAAUACAQFtAXQCFQHsAdEBtAGsAf4BrQF1AW8B+gFSAgIBniAA
- AQIDAQECAwEBFAIBARoBKAIBATkBNwIBAVgBSgICAYUBTgICAY8BFAIBARoBLQIBAUQBCgIBAQwBAgMB
- TAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAcABAQHgAQMBgAEBAgABwAEB
- AcABAQGAAwABwAEBAYABAAGAAwABwAEBAYABAAGAAwABwAEBAYABAAGAAwABwAEBAgABgAMAAcABAQIA
- AYADAAHAAQECAAGAAwABwAEBAgABgAMAAcABAQIAAYADAAHAAQECAAGAAQMCAAHAAQEBgAEAAYABAwIA
- AcABAQGAAgABBwIAAcABAQGAAQEBAAEDAgABwAEDAcABAwEAAQMCAAHAAQcB+AE/AcABBwIACw==
+ AZ8BbQFuAf8BsAISAf8IAAFKAgIBhgn/AdABnAL/AbsBhwH/AekBvwGqAf8B1wHHAcAB/wHfAckBvwH/
+ AfwBqQGBAv8BpAGBAv8B6AHXBf8BugGMAYMB/AEeAgEBKAEDAgEBAgEEAgEBBAHfAt4B/wHdAcsBvAH/
+ AbYCgQH/AasCgQH/AbACgQH/AbMCgQH/AbsBhAGFAf8BygKfAf8B6gLsAf8B6QLqAf8BiAJMAfgBJwIB
+ AThUAAH6AfkB9w7/Av4C/wH7AfgC/wH5AfQC/wH2Ae4B/wHuAd8B2gH/AfEBmAE0Af8B3gGBAR4B/wG6
+ AYkBgQH/AcoCEgH/CAABAgMBAWACAwHTCv8B7QL/AfsB0QL/Ae8BuwL/AeQBsQL/AesBzQn/Ac0BsAGp
+ Af4BIwIBATEBBAIBAQQEAAE8AgEBZAH1AfkB/gH/Af0BwwGBAv8BzAGXAv8BzQGfAv8BzwGpAv8B0QGx
+ Af8B/QHKAbYB/wHzAcEBtwL/AtsC/wLkAf8B7wLoAf8BRgIBAXwBAwIBAQNQAAH9AfoB+BL/Av4C/wH8
+ AfkC/wH5AfQB/wHvAeEB3AL/Ac8BgQH/AboBiQGBAf8BygISAf8QAAECAwEBRgIBAXsB9QHmAd4V/wH6
+ AfEB7AH/AWsBDQEMAekBGAIBAR8BAwIBAQMIAAFLAgIBiwH+AbcBbQH/Af4BywGWAv8BzAGfAv8BzgGo
+ Av8BzgGwAv8BzgG4Av8BzQHAAf8B0gGlAaIB/gFzAhMB6wH/Av0F/wFMAgIBjgEIAgEBCVAAAfcB0gGv
+ Af8B8gHLAasB/wHqAcQBpwH/AeEBuwGiAf8B2QGzAZ0B/wHQAaoBmAH/AcoBpAGUAf8ByAGiAZMB/wHI
+ AaIBkwH/AboBiQGBAf8BygISAf8gAAFAAgEBbQFxAhIB7AHNAbABqAH+AakBbQFoAfoBUgICAZ4gAAEC
+ AwEBAgMBARQCAQEaASgCAQE5ATcCAQFYAUoCAgGFAU4CAgGPARQCAQEaAS0CAQFEAQoCAQEMAQIDAUwA
+ AUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAHAAQEB4AEDAYABAQIAAcABAQHA
+ AQEBgAMAAcABAQGAAQABgAMAAcABAQGAAQABgAMAAcABAQGAAQABgAMAAcABAQIAAYADAAHAAQECAAGA
+ AwABwAEBAgABgAMAAcABAQIAAYADAAHAAQECAAGAAwABwAEBAgABgAEDAgABwAEBAYABAAGAAQMCAAHA
+ AQEBgAIAAQcCAAHAAQEBgAEBAQABAwIAAcABAwHAAQMBAAEDAgABwAEHAfgBPwHAAQcCAAs=
</value>
</data>
</root>
\ No newline at end of file
1.6 +1 -0 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- ExternalToolsOptionsPage.cs 7 Jul 2006 22:32:16 -0000 1.5
+++ ExternalToolsOptionsPage.cs 11 Jul 2006 13:45:34 -0000 1.6
@@ -35,6 +35,7 @@
#region IDTToolsOptionsPage Members
+
public void OnAfterCreated(DTE DTEObject)
{
m_settings = new AddInSettings(DTEObject);
1.4 +227 -178 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.designer.cs
Index: ExternalToolsOptionsPage.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.designer.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- ExternalToolsOptionsPage.designer.cs 5 Jun 2006 22:27:23 -0000 1.3
+++ ExternalToolsOptionsPage.designer.cs 11 Jul 2006 13:45:34 -0000 1.4
@@ -45,9 +45,15 @@
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtSchemaExportCommandLine = new System.Windows.Forms.TextBox();
this.cbPassSchemaExportArguments = new System.Windows.Forms.CheckBox();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.panel3 = new System.Windows.Forms.Panel();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupBox1.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.panel2.SuspendLayout();
+ this.panel3.SuspendLayout();
this.SuspendLayout();
//
// groupBox2
@@ -56,6 +62,7 @@
this.groupBox2.Controls.Add(th...
[truncated message content] |
