Skip to content

Vs2015u3pre3rollup #1593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulvanbrenk merged 3 commits into from
Jun 1, 2017
Merged

Vs2015u3pre3rollup #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ff387a
Fixes an issue where the NPM UI would not update on Install
May 26, 2017
68a1c5e
Fixes issue where the search icon would be overtyped with a long sear…
May 26, 2017
2b685f2
Fix size of property page, and order of elements in narrator
May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Common/Product/SharedProject/CommonPropertyPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public abstract Control Control
get;
}

public virtual Size DefaultSize { get; } = new Size(800, 600);

public abstract void Apply();
public abstract void LoadSettings();

Expand Down Expand Up @@ -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;
}

Expand Down
35 changes: 10 additions & 25 deletions Nodejs/Product/Nodejs/Nodejs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,8 @@
Text="{Binding FilterText,UpdateSourceTrigger=PropertyChanged}"
PreviewKeyDown="FilterTextBox_PreviewKeyDown"
TabIndex="0"
AutomationProperties.Name="{x:Static resx:NpmInstallWindowResources.SearchForPackagesLabel}" />
AutomationProperties.Name="{x:Static resx:NpmInstallWindowResources.SearchForPackagesLabel}"
Padding="0,0,15,0"/>
<TextBlock IsEnabled="False" Background="{x:Null}"
Focusable="False"
IsHitTestVisible="False"
Expand Down
15 changes: 15 additions & 0 deletions Nodejs/Product/Nodejs/NpmUI/PackageCatalogEntryViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using Microsoft.NodejsTools.Npm;

namespace Microsoft.NodejsTools.NpmUI
Expand Down Expand Up @@ -34,12 +35,26 @@ protected PackageCatalogEntryViewModel(
}

public virtual string Name { get; }

public string Version => this.version?.ToString() ?? string.Empty;

public IEnumerable<SemverVersion> AvailableVersions { get; }

public string Author { get; }
public Visibility AuthorVisibility => string.IsNullOrEmpty(this.Author) ? Visibility.Collapsed : Visibility.Visible;

public string Description { get; }
public Visibility DescriptionVisibility => string.IsNullOrEmpty(this.Description) ? Visibility.Collapsed : Visibility.Visible;

public IEnumerable<string> Homepages { get; }
public Visibility HomepagesVisibility => this.Homepages.Any() ? Visibility.Visible : Visibility.Collapsed;

public string Keywords { get; }

public bool IsInstalledLocally => this.localVersion.HasValue;
public bool IsLocalInstallOutOfDate => this.localVersion.HasValue && this.localVersion < this.version;
public string LocalVersion => this.localVersion?.ToString() ?? string.Empty;

public override string ToString()
{
return this.Name;
Expand Down
4 changes: 2 additions & 2 deletions Nodejs/Product/Nodejs/Project/NodejsGeneralPropertyPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public NodejsGeneralPropertyPage()
}

public override System.Windows.Forms.Control Control => this._control;

internal override CommonProjectNode Project
{
get
Expand Down Expand Up @@ -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;
}
Expand Down
Loading