Package Source Mapping Options UI #4711
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| <nuget:VsDialogWindow x:Class="NuGet.Options.AddMappingDialog" | ||
donnie-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0" | ||
| xmlns:nuget="clr-namespace:NuGet.PackageManagement.UI" | ||
| mc:Ignorable="d" | ||
| x:Uid="AddMappingDialogWindow" | ||
| AutomationProperties.Name="AddMappingDialogWindow" | ||
| Height="304" | ||
| Width="456" | ||
| ShowInTaskbar="False" | ||
| WindowStyle="None" | ||
| AllowsTransparency="True" | ||
| WindowStartupLocation="CenterOwner" | ||
| BorderBrush="{DynamicResource {x:Static vsui:EnvironmentColors.PanelBorderBrushKey}}" | ||
| BorderThickness="1" | ||
| Foreground="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"> | ||
| <Grid> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="30"/> | ||
| <RowDefinition Height="*"/> | ||
| <RowDefinition Height="36"/> | ||
| </Grid.RowDefinitions> | ||
| <Grid.Resources> | ||
| <Style TargetType="ScrollBar"> | ||
| <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ScrollBarColorKey}}"/> | ||
| </Style> | ||
| </Grid.Resources> | ||
| <StackPanel Grid.Row="0"> | ||
| <Grid> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition Width="*"/> | ||
| <ColumnDefinition Width="24"/> | ||
| </Grid.ColumnDefinitions> | ||
| <TextBlock AutomationProperties.Name="AddNewPackageNamespace" | ||
| Grid.Column="0" | ||
| Text="{x:Static nuget:Resources.VSOptions_Label_AddPackageNamespace}" | ||
| Margin="12,12,0,0"/> | ||
| <Button x:Uid="ButtonClose" | ||
| Grid.Column="1" | ||
| HorizontalAlignment="Left" | ||
| VerticalAlignment="Top" | ||
| Margin="0,6,6,0" | ||
| Command="{Binding HideButtonCommand}" | ||
| AutomationProperties.Name="Close" | ||
| IsCancel="True" | ||
| BorderBrush="Transparent" | ||
| BorderThickness="0" | ||
| Background="{Binding Path=(Window.Background), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"> | ||
| <Canvas x:Uid="canvas" Width="12" Height="10"> | ||
| <Path x:Uid="CloseButtonPath" | ||
| Width="10" | ||
| Height="8" | ||
| Fill="{Binding Path=(TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" | ||
| Stretch="Uniform" | ||
| Data="F1 M 0,0L 2,0L 5,3L 8,0L 10,0L 6,4L 10,8L 8,8L 5,5L 2,8L 0,8L 4,4L 0,0 Z" /> | ||
| </Canvas> | ||
| </Button> | ||
| </Grid> | ||
| </StackPanel> | ||
| <StackPanel Grid.Row="1"> | ||
| <Grid> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="48"/> | ||
| <RowDefinition Height="*"/> | ||
| <RowDefinition Height="36"/> | ||
| </Grid.RowDefinitions> | ||
| <vsui:WatermarkedTextBox Grid.Row="0" | ||
| AutomationProperties.Name="Package ID" | ||
| x:Name="packageID" | ||
| MaxLength="100" | ||
| Margin="12,6,12,6" | ||
| Watermark="{x:Static nuget:Resources.VSOptions_Watermark_AddPackageNamespace}" | ||
| Foreground="{Binding Path=(TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" | ||
| Background="{Binding Path=(Window.Background), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" | ||
| TextChanged="PackageID_TextChanged"/> | ||
| <StackPanel Orientation="Vertical" Grid.Row="1"> | ||
| <ListView AutomationProperties.Name="Sources List" | ||
| x:Name="sourcesListBox" | ||
| ItemsSource="{Binding SourcesCollection}" | ||
| Margin="12,0,12,12" | ||
| Height="184"> | ||
| <ListView.View> | ||
| <GridView> | ||
| <!-- checkbox column --> | ||
| <GridViewColumn> | ||
| <GridViewColumn.CellTemplate> | ||
| <DataTemplate> | ||
| <CheckBox AutomationProperties.Name="SourcesCheckBox" | ||
| IsTabStop="False" | ||
| IsChecked="{Binding Path=IsChecked, Mode=TwoWay}" | ||
| Checked="CheckBox_Checked" | ||
| Unchecked="CheckBox_Checked"/> | ||
| </DataTemplate> | ||
| </GridViewColumn.CellTemplate> | ||
| </GridViewColumn> | ||
| <!-- the text column --> | ||
| <GridViewColumn x:Name="_projectColumn"> | ||
| <GridViewColumnHeader Content="{x:Static nuget:Resources.VSOptions_Label_Source}" HorizontalContentAlignment="Left"/> | ||
| <GridViewColumn.CellTemplate> | ||
| <DataTemplate> | ||
| <StackPanel Orientation="Horizontal"> | ||
| <TextBlock Name="SourceInfo" | ||
| Text="{Binding SourceInfo.Name}"/> | ||
| </StackPanel> | ||
| </DataTemplate> | ||
| </GridViewColumn.CellTemplate> | ||
| </GridViewColumn> | ||
| </GridView> | ||
| </ListView.View> | ||
| </ListView> | ||
| </StackPanel> | ||
| </Grid> | ||
| </StackPanel> | ||
| <Grid Grid.Row="2"> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition Width="*"/> | ||
| <ColumnDefinition Width="190"/> | ||
| </Grid.ColumnDefinitions> | ||
| <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Column="1"> | ||
| <Button Name="AddCloud" Height="24" Width="86" Command="{Binding AddButtonCommand}" Margin="0,0,3,12" Content="{x:Static nuget:Resources.VSOptions_Button_Add}"/> | ||
| <Button Name="CancelClose" Height="24" Width="86" Command ="{Binding HideButtonCommand}" Margin="3,0,12,12" Content="{x:Static nuget:Resources.VSOptions_Button_Cancel}"/> | ||
| </StackPanel> | ||
| </Grid> | ||
| </Grid> | ||
| </nuget:VsDialogWindow> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| // Copyright (c) .NET Foundation. All rights reserved. | ||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||
|
|
||
| using System.Collections.Generic; | ||
mcnallyella marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| using System.Threading; | ||
| using System.Windows.Input; | ||
| using Microsoft.ServiceHub.Framework; | ||
| using Microsoft.VisualStudio.PlatformUI; | ||
| using NuGet.PackageManagement.UI; | ||
| using NuGet.VisualStudio; | ||
| using NuGet.VisualStudio.Common; | ||
| using NuGet.VisualStudio.Internal.Contracts; | ||
| using Task = System.Threading.Tasks.Task; | ||
|
|
||
| namespace NuGet.Options | ||
|
Member
There was a problem hiding this comment. This namespace doesn't feel right to me. Usually project default namespaces are the project name + folder within the project, so shouldn't the namespace be Same question for the other new files in this PR.
Contributor
Author
There was a problem hiding this comment. I decided not to change the namespace since the two existing options pages are in the NuGet.Options namespace. |
||
| { | ||
| public partial class AddMappingDialog : DialogWindow | ||
| { | ||
| public ICommand HideButtonCommand { get; set; } | ||
|
|
||
| public ICommand AddButtonCommand { get; set; } | ||
|
|
||
| public ItemsChangeObservableCollection<PackageSourceViewModel> SourcesCollection { get; private set; } | ||
|
|
||
| private IReadOnlyList<PackageSourceContextInfo> _originalPackageSources; | ||
|
|
||
| #pragma warning disable ISB001 // Dispose of proxies, disposed in disposing event or in ClearSettings | ||
| private INuGetSourcesService _nugetSourcesService; | ||
| #pragma warning restore ISB001 // Dispose of proxies, disposed in disposing event or in ClearSettings | ||
|
|
||
| private PackageSourceMappingOptionsControl _parent; | ||
|
|
||
| public AddMappingDialog(PackageSourceMappingOptionsControl parent) | ||
| { | ||
| _parent = parent; | ||
| HideButtonCommand = new ButtonCommand(ExecuteHideButtonCommand, CanExecuteHideButtonCommand); | ||
| AddButtonCommand = new ButtonCommand(ExecuteAddButtonCommand, CanExecuteAddButtonCommand); | ||
| SourcesCollection = new ItemsChangeObservableCollection<PackageSourceViewModel>(); | ||
| DataContext = this; | ||
| InitializeComponent(); | ||
| CancellationToken cancellationToken = new CancellationToken(false); | ||
| NuGetUIThreadHelper.JoinableTaskFactory.Run(async () => await InitializeOnActivatedAsync(cancellationToken)); | ||
| } | ||
|
|
||
| internal async Task InitializeOnActivatedAsync(CancellationToken cancellationToken) | ||
| { | ||
| IServiceBrokerProvider serviceBrokerProvider = await ServiceLocator.GetComponentModelServiceAsync<IServiceBrokerProvider>(); | ||
| IServiceBroker serviceBroker = await serviceBrokerProvider.GetAsync(); | ||
| #pragma warning disable ISB001 // Dispose of proxies, disposed in disposing event or in ClearSettings | ||
| _nugetSourcesService = await serviceBroker.GetProxyAsync<INuGetSourcesService>( | ||
donnie-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| NuGetServices.SourceProviderService, | ||
| cancellationToken: cancellationToken); | ||
| #pragma warning restore ISB001 // Dispose of proxies, disposed in disposing event or in ClearSettings | ||
|
|
||
| //show package sources on open | ||
donnie-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| _originalPackageSources = await _nugetSourcesService.GetPackageSourcesAsync(cancellationToken); | ||
| SourcesCollection.Clear(); | ||
| foreach (PackageSourceContextInfo source in _originalPackageSources) | ||
| { | ||
| var tempSource = new PackageSourceViewModel(source, false); | ||
| SourcesCollection.Add(tempSource); | ||
| } | ||
| } | ||
|
|
||
| private void ExecuteHideButtonCommand(object parameter) | ||
| { | ||
| Close(); | ||
| (_parent.ShowButtonCommand as ButtonCommand).InvokeCanExecuteChanged(); | ||
| } | ||
|
|
||
| private bool CanExecuteHideButtonCommand(object parameter) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| private void ExecuteAddButtonCommand(object parameter) | ||
| { | ||
| Close(); | ||
| //does not add mapping if package ID is null | ||
| if (!string.IsNullOrEmpty(packageID.Text)) | ||
| { | ||
| string tempPkgID = packageID.Text; | ||
| List<PackageSourceContextInfo> tempSources = new List<PackageSourceContextInfo>(); | ||
| foreach (PackageSourceViewModel source in sourcesListBox.Items) | ||
| { | ||
| if (source.IsChecked) | ||
| { | ||
| tempSources.Add(source.SourceInfo); | ||
| } | ||
| } | ||
| var tempPkg = new SourceMappingViewModel(tempPkgID, tempSources); | ||
| _parent.SourceMappingsCollection.Add(tempPkg); | ||
| } | ||
| (_parent.ShowButtonCommand as ButtonCommand).InvokeCanExecuteChanged(); | ||
| (_parent.RemoveButtonCommand as ButtonCommand).InvokeCanExecuteChanged(); | ||
| (_parent.ClearButtonCommand as ButtonCommand).InvokeCanExecuteChanged(); | ||
| } | ||
|
|
||
| private bool CanExecuteAddButtonCommand(object parameter) | ||
| { | ||
| foreach (PackageSourceViewModel source in sourcesListBox.Items) | ||
| { | ||
| if (source.IsChecked) | ||
| { | ||
| if (!string.IsNullOrEmpty(packageID.Text)) | ||
| { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| // Allows the user to drag the window around | ||
| protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e) | ||
| { | ||
| base.OnMouseLeftButtonDown(e); | ||
| DragMove(); | ||
| } | ||
|
|
||
| private void CheckBox_Checked(object sender, System.Windows.RoutedEventArgs e) | ||
| { | ||
| (AddButtonCommand as ButtonCommand).InvokeCanExecuteChanged(); | ||
| } | ||
|
|
||
| private void PackageID_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e) | ||
| { | ||
| (AddButtonCommand as ButtonCommand).InvokeCanExecuteChanged(); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.