Fix size of property page, and order of elements in narrator

microsoft · Jun 1, 2017 · 2b685f2 · 2b685f2
1 parent 68a1c5e
commit 2b685f2
Show file tree

Hide file tree

Showing 35 changed files with 911 additions and 11,837 deletions.
diff --git a/Common/Product/SharedProject/CommonPropertyPage.cs b/Common/Product/SharedProject/CommonPropertyPage.cs
@@ -28,6 +28,8 @@ public abstract class CommonPropertyPage : IPropertyPage
             get;
         }
 
+        public virtual Size DefaultSize { get; } = new Size(800, 600);
+
         public abstract void Apply();
         public abstract void LoadSettings();
 
@@ -310,8 +312,8 @@ void IPropertyPage.GetPageInfo(PROPPAGEINFO[] pPageInfo)
             info.pszDocString = null;
             info.pszHelpFile = null;
             info.pszTitle = this.Name;
-            info.SIZE.cx = this.Control.Width;
-            info.SIZE.cy = this.Control.Height;
+            info.SIZE.cx = this.DefaultSize.Width;
+            info.SIZE.cy = this.DefaultSize.Height;
             pPageInfo[0] = info;
         }
 

diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj
@@ -273,6 +273,12 @@
     <Compile Include="Project\DependencyNodeProperties.cs" />
     <Compile Include="Project\LocalModulesNode.cs" />
     <Compile Include="Project\NodejsFolderNode.cs" />
+    <Compile Include="Project\NodejsGeneralPropertyPageControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Project\NodejsGeneralPropertyPageControl.Designer.cs">
+      <DependentUpon>NodejsGeneralPropertyPageControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="Project\NodejsProjectImageName.cs" />
     <Compile Include="Project\NodejsTypeScriptFileNode.cs" />
     <Compile Include="Project\NodejsTypeScriptFileNodeProperties.cs" />
@@ -455,12 +461,6 @@
     <Compile Include="Project\DependencyNode.cs" />
     <Compile Include="Project\NodeModulesNode.cs" />
     <Compile Include="Project\NodejsFileNode.cs" />
-    <Compile Include="Project\NodejsGeneralPropertyPageControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Project\NodejsGeneralPropertyPageControl.Designer.cs">
-      <DependentUpon>NodejsGeneralPropertyPageControl.cs</DependentUpon>
-    </Compile>
     <Compile Include="ProvideEditorExtension2Attribute.cs" />
     <Compile Include="Repl\ClearReplCommand.cs" />
     <Compile Include="Repl\INodejsReplSite.cs" />
@@ -602,6 +602,10 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.en.resx</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.resx">
+      <DependentUpon>NodejsGeneralPropertyPageControl.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources.en.resx">
       <ManifestResourceName>Microsoft.NodejsTools.Resources.en</ManifestResourceName>
       <Generator>ResXFileCodeGenerator</Generator>
@@ -742,25 +746,6 @@
     <EmbeddedResource Include="Project\NewFileMenuGroup\NewFileNameForm.zh-Hans.resx" />
     <EmbeddedResource Include="Project\NewFileMenuGroup\NewFileNameForm.zh-Hant.resx" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.en.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <DependentUpon>NodejsGeneralPropertyPageControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.cs.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.de.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.es.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.fr.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.it.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.ja.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.ko.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.pl.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.pt-BR.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.ru.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.tr.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.zh-Hans.resx" />
-    <EmbeddedResource Include="Project\NodejsGeneralPropertyPageControl.zh-Hant.resx" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Options\NodejsGeneralOptionsControl.en.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>

diff --git a/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPage.cs b/Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPage.cs
@@ -18,6 +18,7 @@ public NodejsGeneralPropertyPage()
         }
 
         public override System.Windows.Forms.Control Control => this._control;
+
         internal override CommonProjectNode Project
         {
             get
@@ -68,8 +69,7 @@ public override void LoadSettings()
                 this._control.Environment = this.Project.GetUnevaluatedProperty(NodeProjectProperty.Environment);
 
                 // Attempt to parse the boolean.  If we fail, assume it is true.
-                bool startWebBrowser;
-                if (!Boolean.TryParse(this.Project.GetUnevaluatedProperty(NodeProjectProperty.StartWebBrowser), out startWebBrowser))
+                if (!Boolean.TryParse(this.Project.GetUnevaluatedProperty(NodeProjectProperty.StartWebBrowser), out var startWebBrowser))
                 {
                     startWebBrowser = true;
                 }