Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Niels Laute
2023-09-13 17:58:42 +02:00
parent eb1732d834
commit c28c12cef7
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml
View File

@@ -61,7 +61,7 @@
</Button.KeyboardAccelerators> </Button.KeyboardAccelerators>
</Button> </Button>
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1" ColumnSpacing="32">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<!-- Left side --> <!-- Left side -->
<ColumnDefinition /> <ColumnDefinition />
@@ -116,18 +116,25 @@
ItemsSource="{x:Bind ViewModel.SystemDefaultSet.Variables, Mode=OneWay}" /> ItemsSource="{x:Bind ViewModel.SystemDefaultSet.Variables, Mode=OneWay}" />
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
<StackPanel Grid.Column="1"> <Grid Grid.Column="1">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<TextBlock <TextBlock
x:Uid="AppliedVariablesLbl" x:Uid="AppliedVariablesLbl"
Margin="0,32,0,0" Margin="0,32,0,0"
Style="{StaticResource BodyStrongTextBlockStyle}" /> Style="{StaticResource BodyStrongTextBlockStyle}" />
<TextBlock x:Uid="AppliedVariablesDescriptionLbl" Foreground="{ThemeResource TextFillColorSecondaryBrush}" /> <TextBlock
x:Uid="AppliedVariablesDescriptionLbl"
Grid.Row="1"
Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
<ScrollViewer <ScrollViewer
x:Name="AppliedVariablesScrollViewer" x:Name="AppliedVariablesScrollViewer"
Grid.Row="1" Grid.Row="2"
Grid.Column="1" Margin="0,16,0,4">
VerticalScrollBarVisibility="Auto"> <ItemsControl Margin="-4,0,0,0" ItemsSource="{x:Bind ViewModel.AppliedVariables, Mode=TwoWay}">
<ItemsControl Margin="0,16,0,4" ItemsSource="{x:Bind ViewModel.AppliedVariables, Mode=TwoWay}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate x:DataType="models:Variable"> <DataTemplate x:DataType="models:Variable">
<Grid Height="48" ColumnSpacing="8"> <Grid Height="48" ColumnSpacing="8">
@@ -161,7 +168,7 @@
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl> </ItemsControl>
</ScrollViewer> </ScrollViewer>
</StackPanel> </Grid>
</Grid> </Grid>
@@ -199,6 +206,7 @@
x:Name="AddProfileDialog" x:Name="AddProfileDialog"
x:Uid="AddProfileDialog" x:Uid="AddProfileDialog"
IsPrimaryButtonEnabled="True" IsPrimaryButtonEnabled="True"
IsSecondaryButtonEnabled="True"
PrimaryButtonStyle="{StaticResource AccentButtonStyle}"> PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
<ContentDialog.DataContext> <ContentDialog.DataContext>
<models:ProfileVariablesSet /> <models:ProfileVariablesSet />
@@ -310,16 +318,11 @@
<ListView <ListView
x:Name="ExistingVariablesListView" x:Name="ExistingVariablesListView"
Grid.Row="1" Grid.Row="1"
Margin="0,12,0,12" Margin="-12,12,0,12"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
ItemsSource="{x:Bind ViewModel.DefaultVariables.Variables, Mode=OneWay}" ItemsSource="{x:Bind ViewModel.DefaultVariables.Variables, Mode=OneWay}"
SelectionMode="Multiple"> SelectionMode="Multiple">
<ListView.Header>
<TextBlock
x:Uid="ExistingVariablesListViewHeader"
Margin="0,0,0,8"
Style="{ThemeResource BodyStrongTextBlockStyle}" />
</ListView.Header>
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate x:DataType="models:Variable"> <DataTemplate x:DataType="models:Variable">
<Grid Height="48" ColumnSpacing="8"> <Grid Height="48" ColumnSpacing="8">

4
src/modules/EnvironmentVariables/EnvironmentVariables/Strings/en-us/Resources.resw
View File

@@ -158,10 +158,10 @@
<value>Value</value> <value>Value</value>
</data> </data>
<data name="AddBtn" xml:space="preserve"> <data name="AddBtn" xml:space="preserve">
<value>Add</value> <value>Save</value>
</data> </data>
<data name="AddNewProfileDialog_Title" xml:space="preserve"> <data name="AddNewProfileDialog_Title" xml:space="preserve">
<value>Add new profile</value> <value>New profile</value>
</data> </data>
<data name="NewProfileEnabled.Header" xml:space="preserve"> <data name="NewProfileEnabled.Header" xml:space="preserve">
<value>Enabled</value> <value>Enabled</value>