- Change Hardcoded text to string

- Adjust Button size to responsive
- Add Accent Button Color
This commit is contained in:
DB p 2021-12-14 17:35:32 +09:00
parent 0b5c77eba2
commit 6095d0b1be
4 changed files with 21 additions and 44 deletions

View file

@ -87,46 +87,20 @@
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Width="100" MinWidth="140"
Margin="0,0,5,0" Margin="0,0,5,0"
Click="BtnCancel_OnClick" Click="BtnCancel_OnClick"
Content="{DynamicResource cancel}" /> Content="{DynamicResource cancel}" />
<Button <Button
Width="100" MinWidth="140"
Margin="5,0,0,0" Margin="5,0,0,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Click="ButtonAdd_OnClick" Click="ButtonAdd_OnClick"
Content="{DynamicResource flowlauncher_plugin_program_update}" /> Content="{DynamicResource flowlauncher_plugin_program_update}"
Style="{DynamicResource AccentButtonStyle}" />
</StackPanel> </StackPanel>
</Border> </Border>
</Grid> </Grid>
<!--
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<Label Margin="15,10" Content="{DynamicResource flowlauncher_plugin_program_directory}" />
<TextBox
Name="Directory"
Width="278"
Margin="10,7"
VerticalAlignment="Center" />
</StackPanel>
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<Button
Width="70"
Height="31"
Margin="10"
HorizontalAlignment="Right"
Click="BrowseButton_Click"
Content="{DynamicResource flowlauncher_plugin_program_browse}" />
<Button
Width="70"
Height="31"
Margin="10"
HorizontalAlignment="Right"
Click="ButtonAdd_OnClick"
Content="{DynamicResource flowlauncher_plugin_program_update}" />
</StackPanel>
</StackPanel>
-->
</Window> </Window>

View file

@ -7,6 +7,8 @@
<system:String x:Key="flowlauncher_plugin_program_delete">Delete</system:String> <system:String x:Key="flowlauncher_plugin_program_delete">Delete</system:String>
<system:String x:Key="flowlauncher_plugin_program_edit">Edit</system:String> <system:String x:Key="flowlauncher_plugin_program_edit">Edit</system:String>
<system:String x:Key="flowlauncher_plugin_program_add">Add</system:String> <system:String x:Key="flowlauncher_plugin_program_add">Add</system:String>
<system:String x:Key="flowlauncher_plugin_program_name">Name</system:String>
<system:String x:Key="flowlauncher_plugin_program_enable">Enable</system:String>
<system:String x:Key="flowlauncher_plugin_program_disable">Disable</system:String> <system:String x:Key="flowlauncher_plugin_program_disable">Disable</system:String>
<system:String x:Key="flowlauncher_plugin_program_location">Location</system:String> <system:String x:Key="flowlauncher_plugin_program_location">Location</system:String>
<system:String x:Key="flowlauncher_plugin_program_all_programs">All Programs</system:String> <system:String x:Key="flowlauncher_plugin_program_all_programs">All Programs</system:String>

View file

@ -80,19 +80,20 @@
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal"> <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<Button <Button
x:Name="btnCancel" x:Name="btnCancel"
Width="100"
Height="30" Height="30"
MinWidth="140"
Margin="0,0,5,0" Margin="0,0,5,0"
Click="BtnCancel_OnClick" Click="BtnCancel_OnClick"
Content="{DynamicResource cancel}" /> Content="{DynamicResource cancel}" />
<Button <Button
Width="100"
Height="30" Height="30"
MinWidth="140"
Margin="5,0,0,0" Margin="5,0,0,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Click="ButtonBase_OnClick" Click="ButtonBase_OnClick"
Content="{DynamicResource flowlauncher_plugin_program_update}" /> Content="{DynamicResource flowlauncher_plugin_program_update}"
Style="{DynamicResource AccentButtonStyle}" />
</StackPanel> </StackPanel>
</Border> </Border>
</Grid> </Grid>

View file

@ -22,7 +22,7 @@
<StackPanel Width="Auto" Orientation="Horizontal"> <StackPanel Width="Auto" Orientation="Horizontal">
<CheckBox <CheckBox
Name="StartMenuEnabled" Name="StartMenuEnabled"
Width="200" Width="220"
Margin="70,8,10,8" Margin="70,8,10,8"
Content="{DynamicResource flowlauncher_plugin_program_index_start}" Content="{DynamicResource flowlauncher_plugin_program_index_start}"
IsChecked="{Binding EnableStartMenuSource}" IsChecked="{Binding EnableStartMenuSource}"
@ -42,7 +42,7 @@
<StackPanel Width="Auto" Orientation="Horizontal"> <StackPanel Width="Auto" Orientation="Horizontal">
<CheckBox <CheckBox
Name="HideLnkEnabled" Name="HideLnkEnabled"
Width="200" Width="220"
Margin="70,8,10,8" Margin="70,8,10,8"
Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}" Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
IsChecked="{Binding HideAppsPath}" IsChecked="{Binding HideAppsPath}"
@ -66,21 +66,21 @@
Orientation="Horizontal"> Orientation="Horizontal">
<Button <Button
x:Name="btnLoadAllProgramSource" x:Name="btnLoadAllProgramSource"
Width="120" MinWidth="120"
Margin="10,10,5,10" Margin="10,10,5,10"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Click="btnLoadAllProgramSource_OnClick" Click="btnLoadAllProgramSource_OnClick"
Content="{DynamicResource flowlauncher_plugin_program_all_programs}" /> Content="{DynamicResource flowlauncher_plugin_program_all_programs}" />
<Button <Button
x:Name="btnProgramSuffixes" x:Name="btnProgramSuffixes"
Width="120" MinWidth="120"
Margin="5,10,5,10" Margin="5,10,5,10"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Click="BtnProgramSuffixes_OnClick" Click="BtnProgramSuffixes_OnClick"
Content="{DynamicResource flowlauncher_plugin_program_suffixes}" /> Content="{DynamicResource flowlauncher_plugin_program_suffixes}" />
<Button <Button
x:Name="btnReindex" x:Name="btnReindex"
Width="120" MinWidth="120"
Margin="5,10,5,10" Margin="5,10,5,10"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Click="btnReindex_Click" Click="btnReindex_Click"
@ -119,14 +119,14 @@
SelectionMode="Extended"> SelectionMode="Extended">
<ListView.View> <ListView.View>
<GridView> <GridView>
<GridViewColumn Width="150" Header="Name"> <GridViewColumn Width="150" Header="{DynamicResource flowlauncher_plugin_program_name}">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Name}" /> <TextBlock Text="{Binding Name}" />
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Header="Enabled"> <GridViewColumn Header="{DynamicResource flowlauncher_plugin_program_enable}">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<TextBlock <TextBlock
@ -153,19 +153,19 @@
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<Button <Button
x:Name="btnProgramSourceStatus" x:Name="btnProgramSourceStatus"
Width="100" MinWidth="100"
Margin="10" Margin="10"
Click="btnProgramSourceStatus_OnClick" Click="btnProgramSourceStatus_OnClick"
Content="{DynamicResource flowlauncher_plugin_program_disable}" /> Content="{DynamicResource flowlauncher_plugin_program_disable}" />
<Button <Button
x:Name="btnEditProgramSource" x:Name="btnEditProgramSource"
Width="100" MinWidth="100"
Margin="10" Margin="10"
Click="btnEditProgramSource_OnClick" Click="btnEditProgramSource_OnClick"
Content="{DynamicResource flowlauncher_plugin_program_edit}" /> Content="{DynamicResource flowlauncher_plugin_program_edit}" />
<Button <Button
x:Name="btnAddProgramSource" x:Name="btnAddProgramSource"
Width="100" MinWidth="100"
Margin="10,10,0,10" Margin="10,10,0,10"
Click="btnAddProgramSource_OnClick" Click="btnAddProgramSource_OnClick"
Content="{DynamicResource flowlauncher_plugin_program_add}" /> Content="{DynamicResource flowlauncher_plugin_program_add}" />