Cleanup using Resharper

This commit is contained in:
bao-qian
2016-03-26 04:46:39 +00:00
parent 0728d96339
commit c41fbbb93e
10 changed files with 351 additions and 291 deletions

View File

@@ -9,30 +9,37 @@
Height="200" Width="600"> Height="200" Width="600">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition></RowDefinition> <RowDefinition />
<RowDefinition></RowDefinition> <RowDefinition />
<RowDefinition></RowDefinition> <RowDefinition />
<RowDefinition></RowDefinition> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="170"></ColumnDefinition> <ColumnDefinition Width="170" />
<ColumnDefinition></ColumnDefinition> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Text="{DynamicResource oldActionKeyword}"></TextBlock> <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
<TextBlock x:Name="tbOldActionKeyword" Margin="10" FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left">Old ActionKeywords:</TextBlock> HorizontalAlignment="Right" Text="{DynamicResource oldActionKeyword}" />
<TextBlock x:Name="tbOldActionKeyword" Margin="10" FontSize="14" Grid.Row="0" Grid.Column="1"
VerticalAlignment="Center" HorizontalAlignment="Left">
Old ActionKeywords:
</TextBlock>
<TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Text="{DynamicResource newActionKeyword}"></TextBlock> <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
<StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1" > HorizontalAlignment="Right" Text="{DynamicResource newActionKeyword}" />
<TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBox> <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
<TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
</StackPanel> </StackPanel>
<TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Padding="5" Foreground="Gray" Text="{DynamicResource actionkeyword_tips}"></TextBlock> <TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Padding="5" Foreground="Gray"
Text="{DynamicResource actionkeyword_tips}" />
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="1"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="1">
<Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25" Content="{DynamicResource cancel}"></Button> <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25"
<Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="25" Click="btnDone_OnClick"> Content="{DynamicResource cancel}" />
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}"></TextBlock> <Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="25" Click="btnDone_OnClick">
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
</Button> </Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Window> </Window>

View File

@@ -1,7 +1,6 @@
<Application x:Class="Wox.App" <Application x:Class="Wox.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
>
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>

View File

@@ -8,28 +8,32 @@
Title="Custom Plugin Hotkey" Height="200" Width="674.766"> Title="Custom Plugin Hotkey" Height="200" Width="674.766">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition></RowDefinition> <RowDefinition />
<RowDefinition></RowDefinition> <RowDefinition />
<RowDefinition></RowDefinition> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="150"></ColumnDefinition> <ColumnDefinition Width="150" />
<ColumnDefinition></ColumnDefinition> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Text="{DynamicResource hotkey}"></TextBlock> <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
<wox:HotkeyControl x:Name="ctlHotkey" Margin="10" Grid.Column="1" /> HorizontalAlignment="Right" Text="{DynamicResource hotkey}" />
<wox:HotkeyControl x:Name="ctlHotkey" Margin="10" Grid.Column="1" />
<TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}"></TextBlock> <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
<StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1" > HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}" />
<TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left"></TextBox> <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
<Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick" Content="{DynamicResource preview}"></Button> <TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
<Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
Content="{DynamicResource preview}" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="1"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="1">
<Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25" Content="{DynamicResource cancel}"></Button> <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25"
<Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="25" Click="btnAdd_OnClick"> Content="{DynamicResource cancel}" />
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}"></TextBlock> <Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="25" Click="btnAdd_OnClick">
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
</Button> </Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Window> </Window>

View File

@@ -1,17 +1,18 @@
<UserControl x:Class="Wox.HotkeyControl" <UserControl x:Class="Wox.HotkeyControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d" mc:Ignorable="d"
Height="24" Height="24"
d:DesignHeight="300" d:DesignWidth="300"> d:DesignHeight="300" d:DesignWidth="300">
<Grid > <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="150"></ColumnDefinition> <ColumnDefinition Width="150" />
<ColumnDefinition Width="120"></ColumnDefinition> <ColumnDefinition Width="120" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBox x:Name="tbHotkey" TabIndex="100" VerticalContentAlignment="Center" Grid.Column="0" PreviewKeyDown="TbHotkey_OnPreviewKeyDown"></TextBox> <TextBox x:Name="tbHotkey" TabIndex="100" VerticalContentAlignment="Center" Grid.Column="0"
<TextBlock x:Name="tbMsg" Visibility="Hidden" Margin="5 0 0 0" VerticalAlignment="Center" Grid.Column="1" ></TextBlock> PreviewKeyDown="TbHotkey_OnPreviewKeyDown" />
<TextBlock x:Name="tbMsg" Visibility="Hidden" Margin="5 0 0 0" VerticalAlignment="Center" Grid.Column="1" />
</Grid> </Grid>
</UserControl> </UserControl>

View File

@@ -27,8 +27,7 @@
d:DataContext="{d:DesignInstance vm:MainViewModel, IsDesignTimeCreatable=True}"> d:DataContext="{d:DesignInstance vm:MainViewModel, IsDesignTimeCreatable=True}">
<Window.Resources> <Window.Resources>
<DataTemplate DataType="{x:Type vm:ResultsViewModel}"> <DataTemplate DataType="{x:Type vm:ResultsViewModel}">
<wox:ResultListBox PreviewMouseDown="OnPreviewMouseButtonDown"> <wox:ResultListBox PreviewMouseDown="OnPreviewMouseButtonDown" />
</wox:ResultListBox>
</DataTemplate> </DataTemplate>
</Window.Resources> </Window.Resources>
<Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown"> <Border Style="{DynamicResource WindowBorderStyle}" MouseDown="OnMouseDown">
@@ -38,14 +37,15 @@
PreviewDragOver="OnPreviewDragOver" PreviewDragOver="OnPreviewDragOver"
AllowDrop="True" AllowDrop="True"
x:Name="QueryTextBox" /> x:Name="QueryTextBox" />
<Line Style="{DynamicResource PendingLineStyle}" x:Name="progressBar" Y1="0" Y2="0" X2="100" Height="2" StrokeThickness="1" <Line Style="{DynamicResource PendingLineStyle}" x:Name="progressBar" Y1="0" Y2="0" X2="100" Height="2"
StrokeThickness="1"
Visibility="{Binding ProgressBarVisibility}"> Visibility="{Binding ProgressBarVisibility}">
<Line.ToolTip> <Line.ToolTip>
<ToolTip IsOpen="{Binding IsProgressBarTooltipVisible}"></ToolTip> <ToolTip IsOpen="{Binding IsProgressBarTooltipVisible}" />
</Line.ToolTip> </Line.ToolTip>
</Line> </Line>
<ContentControl Content="{Binding Results}" Visibility="{Binding ResultListBoxVisibility}"/> <ContentControl Content="{Binding Results}" Visibility="{Binding ResultListBoxVisibility}" />
<ContentControl Content="{Binding ContextMenu}" Visibility="{Binding ContextMenuVisibility}"/> <ContentControl Content="{Binding ContextMenu}" Visibility="{Binding ContextMenuVisibility}" />
</StackPanel> </StackPanel>
</Border> </Border>
</Window> </Window>

View File

@@ -11,28 +11,30 @@
<Window.Triggers> <Window.Triggers>
<EventTrigger RoutedEvent="Window.Loaded"> <EventTrigger RoutedEvent="Window.Loaded">
<BeginStoryboard> <BeginStoryboard>
<Storyboard > <Storyboard>
<DoubleAnimation x:Name="showAnimation" Duration="0:0:0.3" Storyboard.TargetProperty="Top" AccelerationRatio="0.2"/> <DoubleAnimation x:Name="showAnimation" Duration="0:0:0.3" Storyboard.TargetProperty="Top"
AccelerationRatio="0.2" />
</Storyboard> </Storyboard>
</BeginStoryboard> </BeginStoryboard>
</EventTrigger> </EventTrigger>
</Window.Triggers> </Window.Triggers>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="32"></ColumnDefinition> <ColumnDefinition Width="32" />
<ColumnDefinition/> <ColumnDefinition />
<ColumnDefinition Width="16"></ColumnDefinition> <ColumnDefinition Width="16" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left" ></Image> <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left" />
<Grid HorizontalAlignment="Stretch" Margin="5 0 0 0" Grid.Column="1" VerticalAlignment="Stretch"> <Grid HorizontalAlignment="Stretch" Margin="5 0 0 0" Grid.Column="1" VerticalAlignment="Stretch">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition></RowDefinition> <RowDefinition />
<RowDefinition></RowDefinition> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock x:Name="tbTitle" FontSize="16" Foreground="#37392c" FontWeight="Medium">Title</TextBlock> <TextBlock x:Name="tbTitle" FontSize="16" Foreground="#37392c" FontWeight="Medium">Title</TextBlock>
<TextBlock Grid.Row="1" Foreground="#8e94a4" x:Name="tbSubTitle">sdfdsf</TextBlock> <TextBlock Grid.Row="1" Foreground="#8e94a4" x:Name="tbSubTitle">sdfdsf</TextBlock>
</Grid> </Grid>
<Image x:Name="imgClose" Grid.Column="2" Cursor="Hand" Width="16" VerticalAlignment="Top" HorizontalAlignment="Right" /> <Image x:Name="imgClose" Grid.Column="2" Cursor="Hand" Width="16" VerticalAlignment="Top"
HorizontalAlignment="Right" />
</Grid> </Grid>
</Window> </Window>

View File

@@ -1,97 +1,98 @@
<ListBox x:Class="Wox.ResultListBox" <ListBox x:Class="Wox.ResultListBox"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:converters="clr-namespace:Wox.Converters" xmlns:converters="clr-namespace:Wox.Converters"
xmlns:vm ="clr-namespace:Wox.ViewModel" xmlns:vm="clr-namespace:Wox.ViewModel"
mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100" d:DataContext="{d:DesignInstance vm:ResultsViewModel}" mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100"
MaxHeight="{Binding MaxHeight}" SelectedItem="{Binding SelectedResult}" d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
HorizontalContentAlignment="Stretch" ItemsSource="{Binding Results}" Margin="{Binding Margin}" MaxHeight="{Binding MaxHeight}" SelectedItem="{Binding SelectedResult}"
Style="{DynamicResource BaseListboxStyle}" SelectionChanged="lbResults_SelectionChanged" Focusable="False" HorizontalContentAlignment="Stretch" ItemsSource="{Binding Results}" Margin="{Binding Margin}"
KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single" Style="{DynamicResource BaseListboxStyle}" SelectionChanged="lbResults_SelectionChanged" Focusable="False"
VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard"> KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single"
<ListBox.ItemTemplate> VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard">
<DataTemplate> <ListBox.ItemTemplate>
<DataTemplate.DataType> <DataTemplate>
<x:Type TypeName="vm:ResultViewModel" /> <DataTemplate.DataType>
</DataTemplate.DataType> <x:Type TypeName="vm:ResultViewModel" />
<Button> </DataTemplate.DataType>
<Button.Template> <Button>
<ControlTemplate> <Button.Template>
<ContentPresenter Content="{TemplateBinding Button.Content}"></ContentPresenter> <ControlTemplate>
</ControlTemplate> <ContentPresenter Content="{TemplateBinding Button.Content}" />
</Button.Template> </ControlTemplate>
<Button.Content> </Button.Template>
<Grid HorizontalAlignment="Stretch" Height="40" VerticalAlignment="Stretch" Margin="5" Cursor="Hand"> <Button.Content>
<Grid.Resources> <Grid HorizontalAlignment="Stretch" Height="40" VerticalAlignment="Stretch" Margin="5"
<converters:ImagePathConverter x:Key="ImageConverter" /> Cursor="Hand">
</Grid.Resources> <Grid.Resources>
<Grid.ColumnDefinitions> <converters:ImagePathConverter x:Key="ImageConverter" />
<ColumnDefinition Width="32" /> </Grid.Resources>
<ColumnDefinition /> <Grid.ColumnDefinitions>
<ColumnDefinition Width="0" /> <ColumnDefinition Width="32" />
</Grid.ColumnDefinitions> <ColumnDefinition />
<Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left" <ColumnDefinition Width="0" />
Source="{Binding FullIcoPath,Converter={StaticResource ImageConverter},IsAsync=True}" /> </Grid.ColumnDefinitions>
<Grid Margin="5 0 5 0" Grid.Column="1" HorizontalAlignment="Stretch"> <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left"
<Grid.RowDefinitions> Source="{Binding FullIcoPath,Converter={StaticResource ImageConverter},IsAsync=True}" />
<RowDefinition /> <Grid Margin="5 0 5 0" Grid.Column="1" HorizontalAlignment="Stretch">
<RowDefinition Height="Auto" x:Name="SubTitleRowDefinition" /> <Grid.RowDefinitions>
</Grid.RowDefinitions> <RowDefinition />
<TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left" <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition" />
VerticalAlignment="Center" ToolTip="{Binding Title}" x:Name="tbTitle" </Grid.RowDefinitions>
Text="{Binding Title}" > <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
</TextBlock> VerticalAlignment="Center" ToolTip="{Binding Title}" x:Name="tbTitle"
<TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding SubTitle}" Text="{Binding Title}" />
Visibility="{Binding SubTitle, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding SubTitle}"
Grid.Row="1" x:Name="tbSubTitle" Text="{Binding SubTitle}" > Visibility="{Binding SubTitle, Converter={converters:StringNullOrEmptyToVisibilityConverter}}"
</TextBlock> Grid.Row="1" x:Name="tbSubTitle" Text="{Binding SubTitle}" />
</Grid>
</Grid> </Grid>
</Button.Content> </Grid>
</Button> </Button.Content>
<!-- a result item height is 50 including margin --> </Button>
<DataTemplate.Triggers> <!-- a result item height is 50 including margin -->
<DataTrigger Binding="{Binding Path=IsSelected}" Value="True"> <DataTemplate.Triggers>
<Setter TargetName="tbTitle" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" /> <DataTrigger Binding="{Binding Path=IsSelected}" Value="True">
</DataTrigger> <Setter TargetName="tbTitle" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
<DataTrigger Binding="{Binding Path=IsSelected}" Value="True"> </DataTrigger>
<Setter TargetName="tbSubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}" /> <DataTrigger Binding="{Binding Path=IsSelected}" Value="True">
</DataTrigger> <Setter TargetName="tbSubTitle" Property="Style"
</DataTemplate.Triggers> Value="{DynamicResource ItemSubTitleSelectedStyle}" />
</DataTemplate> </DataTrigger>
</ListBox.ItemTemplate> </DataTemplate.Triggers>
<!--http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062--> </DataTemplate>
<ListBox.ItemContainerStyle> </ListBox.ItemTemplate>
<Style TargetType="{x:Type ListBoxItem}"> <!--http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062-->
<Setter Property="Template"> <ListBox.ItemContainerStyle>
<Setter.Value> <Style TargetType="{x:Type ListBoxItem}">
<ControlTemplate TargetType="{x:Type ListBoxItem}"> <Setter Property="Template">
<Border x:Name="Bd" <Setter.Value>
Background="{TemplateBinding Background}" <ControlTemplate TargetType="{x:Type ListBoxItem}">
BorderBrush="{TemplateBinding BorderBrush}" <Border x:Name="Bd"
BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"
Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}"
SnapsToDevicePixels="True"> BorderThickness="{TemplateBinding BorderThickness}"
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="True">
Content="{TemplateBinding Content}" <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
ContentStringFormat="{TemplateBinding ContentStringFormat}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" /> ContentStringFormat="{TemplateBinding ContentStringFormat}"
</Border> ContentTemplate="{TemplateBinding ContentTemplate}"
<ControlTemplate.Triggers> SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Trigger Property="IsSelected" Value="True"> </Border>
<Setter TargetName="Bd" Property="Background" <ControlTemplate.Triggers>
Value="{DynamicResource ItemSelectedBackgroundColor}" /> <Trigger Property="IsSelected" Value="True">
<Setter TargetName="Bd" Property="BorderBrush" <Setter TargetName="Bd" Property="Background"
Value="{DynamicResource ItemSelectedBackgroundColor}" /> Value="{DynamicResource ItemSelectedBackgroundColor}" />
</Trigger> <Setter TargetName="Bd" Property="BorderBrush"
</ControlTemplate.Triggers> Value="{DynamicResource ItemSelectedBackgroundColor}" />
</ControlTemplate> </Trigger>
</Setter.Value> </ControlTemplate.Triggers>
</Setter> </ControlTemplate>
</Style> </Setter.Value>
</ListBox.ItemContainerStyle> </Setter>
</Style>
</ListBox.ItemContainerStyle>
</ListBox> </ListBox>

View File

@@ -1,78 +1,87 @@
<Window <Window
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:wox="clr-namespace:Wox" xmlns:wox="clr-namespace:Wox"
x:Class="Wox.SettingWindow" x:Class="Wox.SettingWindow"
xmlns:woxPlugin="clr-namespace:Wox.Plugin;assembly=Wox.Plugin" xmlns:woxPlugin="clr-namespace:Wox.Plugin;assembly=Wox.Plugin"
xmlns:converters="clr-namespace:Wox.Converters" xmlns:converters="clr-namespace:Wox.Converters"
xmlns:userSettings="clr-namespace:Wox.Core.UserSettings;assembly=Wox.Core" xmlns:userSettings="clr-namespace:Wox.Core.UserSettings;assembly=Wox.Core"
xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:sys="clr-namespace:System;assembly=mscorlib"
Icon="Images\app.png" Icon="Images\app.png"
Title="{DynamicResource woxsettings}" Title="{DynamicResource woxsettings}"
ResizeMode="NoResize" ResizeMode="NoResize"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Height="600" Width="800" PreviewKeyDown="Window_PreviewKeyDown"> Height="600" Width="800" PreviewKeyDown="Window_PreviewKeyDown">
<Window.Resources> <Window.Resources>
<ListBoxItem HorizontalContentAlignment="Stretch" <ListBoxItem HorizontalContentAlignment="Stretch"
IsEnabled="False" IsEnabled="False"
IsHitTestVisible="False" x:Key="FeatureBoxSeperator"> IsHitTestVisible="False" x:Key="FeatureBoxSeperator">
<Separator Width="{Binding ElementName=lbPlugins, Path=ActualWidth}"/> <Separator Width="{Binding ElementName=lbPlugins, Path=ActualWidth}" />
</ListBoxItem> </ListBoxItem>
<converters:ImagePathConverter x:Key="ImageConverter" /> <converters:ImagePathConverter x:Key="ImageConverter" />
</Window.Resources> </Window.Resources>
<TabControl Height="auto" x:Name="settingTab" SelectionChanged="settingTab_SelectionChanged"> <TabControl Height="auto" x:Name="settingTab" SelectionChanged="settingTab_SelectionChanged">
<TabItem Header="{DynamicResource general}"> <TabItem Header="{DynamicResource general}">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<CheckBox x:Name="cbStartWithWindows" Unchecked="CbStartWithWindows_OnUnchecked" Checked="CbStartWithWindows_OnChecked" Margin="10"> <CheckBox x:Name="cbStartWithWindows" Unchecked="CbStartWithWindows_OnUnchecked"
<TextBlock Text="{DynamicResource startWoxOnSystemStartup}" ></TextBlock> Checked="CbStartWithWindows_OnChecked" Margin="10">
<TextBlock Text="{DynamicResource startWoxOnSystemStartup}" />
</CheckBox> </CheckBox>
<CheckBox x:Name="cbHideWhenDeactive" Margin="10"> <CheckBox x:Name="cbHideWhenDeactive" Margin="10">
<TextBlock Text="{DynamicResource hideWoxWhenLoseFocus}" ></TextBlock> <TextBlock Text="{DynamicResource hideWoxWhenLoseFocus}" />
</CheckBox> </CheckBox>
<CheckBox x:Name="cbDontPromptUpdateMsg" Margin="10"> <CheckBox x:Name="cbDontPromptUpdateMsg" Margin="10">
<TextBlock Text="{DynamicResource dontPromptUpdateMsg}" ></TextBlock> <TextBlock Text="{DynamicResource dontPromptUpdateMsg}" />
</CheckBox> </CheckBox>
<CheckBox x:Name="cbRememberLastLocation" Margin="10"> <CheckBox x:Name="cbRememberLastLocation" Margin="10">
<TextBlock Text="{DynamicResource rememberLastLocation}" ></TextBlock> <TextBlock Text="{DynamicResource rememberLastLocation}" />
</CheckBox> </CheckBox>
<CheckBox x:Name="cbIgnoreHotkeysOnFullscreen" Margin="10"> <CheckBox x:Name="cbIgnoreHotkeysOnFullscreen" Margin="10">
<TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreen}" ></TextBlock> <TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreen}" />
</CheckBox> </CheckBox>
<StackPanel Margin="10" Orientation="Horizontal"> <StackPanel Margin="10" Orientation="Horizontal">
<TextBlock Text="{DynamicResource language}"></TextBlock> <TextBlock Text="{DynamicResource language}" />
<ComboBox Margin="10 0 0 0" Width="120" x:Name="cbLanguages" /> <ComboBox Margin="10 0 0 0" Width="120" x:Name="cbLanguages" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Margin="10"> <StackPanel Orientation="Horizontal" Margin="10">
<TextBlock Text="{DynamicResource maxShowResults}"></TextBlock> <TextBlock Text="{DynamicResource maxShowResults}" />
<ComboBox Margin="10 0 0 0" Width="45" Name="comboMaxResultsToShow"/> <ComboBox Margin="10 0 0 0" Width="45" Name="comboMaxResultsToShow" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</TabItem> </TabItem>
<TabItem Header="{DynamicResource plugin}" x:Name="tabPlugin"> <TabItem Header="{DynamicResource plugin}" x:Name="tabPlugin">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200"/> <ColumnDefinition Width="200" />
<ColumnDefinition/> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<DockPanel Grid.Column="0" > <DockPanel Grid.Column="0">
<TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Left" Cursor="Hand" MouseUp="tbMorePlugins_MouseUp" x:Name="tbMorePlugins" Foreground="Blue" Text="{DynamicResource browserMorePlugins}"></TextBlock> <TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Left" Cursor="Hand"
<ListBox x:Name="lbPlugins" Margin="10, 0, 10, 10" SelectionChanged="lbPlugins_OnSelectionChanged" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Grid.IsSharedSizeScope="True" > MouseUp="tbMorePlugins_MouseUp" x:Name="tbMorePlugins" Foreground="Blue"
Text="{DynamicResource browserMorePlugins}" />
<ListBox x:Name="lbPlugins" Margin="10, 0, 10, 10" SelectionChanged="lbPlugins_OnSelectionChanged"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" Grid.IsSharedSizeScope="True">
<ListBox.Resources> <ListBox.Resources>
<DataTemplate DataType="{x:Type woxPlugin:PluginPair}"> <DataTemplate DataType="{x:Type woxPlugin:PluginPair}">
<Grid Height="36" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="3"> <Grid Height="36" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="3">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="32"></ColumnDefinition> <ColumnDefinition Width="32" />
<ColumnDefinition/> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image Width="32" Height="32" HorizontalAlignment="Left" Source="{Binding Metadata.FullIcoPath,Converter={StaticResource ImageConverter},IsAsync=True}"> <Image Width="32" Height="32" HorizontalAlignment="Left"
</Image> Source="{Binding Metadata.FullIcoPath,Converter={StaticResource ImageConverter},IsAsync=True}" />
<Grid Margin="3 0 3 0" Grid.Column="1" HorizontalAlignment="Stretch"> <Grid Margin="3 0 3 0" Grid.Column="1" HorizontalAlignment="Stretch">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition></RowDefinition> <RowDefinition />
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock VerticalAlignment="Center" ToolTip="{Binding Metadata.Name}" x:Name="tbTitle" Text="{Binding Metadata.Name}"></TextBlock> <TextBlock VerticalAlignment="Center" ToolTip="{Binding Metadata.Name}"
<TextBlock ToolTip="{Binding Metadata.Description}" Visibility="{Binding Metadata.Description, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" Grid.Row="1" x:Name="tbSubTitle" Text="{Binding Metadata.Description}" Opacity="0.5"></TextBlock> x:Name="tbTitle" Text="{Binding Metadata.Name}" />
<TextBlock ToolTip="{Binding Metadata.Description}"
Visibility="{Binding Metadata.Description, Converter={converters:StringNullOrEmptyToVisibilityConverter}}"
Grid.Row="1" x:Name="tbSubTitle"
Text="{Binding Metadata.Description}" Opacity="0.5" />
</Grid> </Grid>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
@@ -81,75 +90,91 @@
</DockPanel> </DockPanel>
<Grid Margin="0" Grid.Column="1"> <Grid Margin="0" Grid.Column="1">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto" />
<RowDefinition Height="*"/> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ContentControl x:Name="PluginInfoPanel" Grid.ColumnSpan="1" Grid.Row="0" Margin="10 10 10 0"> <ContentControl x:Name="PluginInfoPanel" Grid.ColumnSpan="1" Grid.Row="0" Margin="10 10 10 0">
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="48"></ColumnDefinition> <ColumnDefinition Width="48" />
<ColumnDefinition/> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image Width="48" Height="48" HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="pluginIcon"/> <Image Width="48" Height="48" HorizontalAlignment="Left" VerticalAlignment="Top"
x:Name="pluginIcon" />
<Grid Margin="10,0,0,0" Grid.Column="1" HorizontalAlignment="Stretch"> <Grid Margin="10,0,0,0" Grid.Column="1" HorizontalAlignment="Stretch">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition></RowDefinition> <RowDefinition />
<RowDefinition></RowDefinition> <RowDefinition />
<RowDefinition></RowDefinition> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<DockPanel Grid.Row="0"> <DockPanel Grid.Row="0">
<TextBlock x:Name="pluginTitle" Text="Plugin Title" Cursor="Hand" MouseUp="PluginTitle_OnMouseUp" ToolTip="{Binding Source=pluginTitle, Path=Text}" FontSize="24"></TextBlock> <TextBlock x:Name="pluginTitle" Text="Plugin Title" Cursor="Hand"
<TextBlock Opacity="0.5" VerticalAlignment="Bottom" HorizontalAlignment="Right" x:Name="pluginAuthor" Text="{DynamicResource author}"></TextBlock> MouseUp="PluginTitle_OnMouseUp"
ToolTip="{Binding Source=pluginTitle, Path=Text}" FontSize="24" />
<TextBlock Opacity="0.5" VerticalAlignment="Bottom" HorizontalAlignment="Right"
x:Name="pluginAuthor" Text="{DynamicResource author}" />
</DockPanel> </DockPanel>
<TextBlock Grid.Row="1" x:Name="pluginSubTitle" Opacity="0.5" ToolTip="{Binding Source=pluginSubTitle, Path=Text}" Visibility="{Binding Source=pluginSubTitle, Path=Text, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" ></TextBlock> <TextBlock Grid.Row="1" x:Name="pluginSubTitle" Opacity="0.5"
ToolTip="{Binding Source=pluginSubTitle, Path=Text}"
Visibility="{Binding Source=pluginSubTitle, Path=Text, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" />
<DockPanel Grid.Row="2" Margin="0 10 0 8"> <DockPanel Grid.Row="2" Margin="0 10 0 8">
<CheckBox x:Name="cbDisablePlugin" Click="CbDisablePlugin_OnClick"> <CheckBox x:Name="cbDisablePlugin" Click="CbDisablePlugin_OnClick">
<TextBlock Text="{DynamicResource disable}"></TextBlock> <TextBlock Text="{DynamicResource disable}" />
</CheckBox> </CheckBox>
<TextBlock x:Name="pluginActionKeywordsTitle" Margin="20 0 0 0" Text="{DynamicResource actionKeywords}" /> <TextBlock x:Name="pluginActionKeywordsTitle" Margin="20 0 0 0"
<TextBlock Margin="5 0 0 0" ToolTip="Change Action Keywords" Cursor="Hand" MouseUp="PluginActionKeywords_OnMouseUp" Foreground="Blue" Text="keys" x:Name="pluginActionKeywords"></TextBlock> Text="{DynamicResource actionKeywords}" />
<TextBlock Margin="10 0 0 0" Text="Init time: 0ms" x:Name="pluginInitTime"></TextBlock> <TextBlock Margin="5 0 0 0" ToolTip="Change Action Keywords" Cursor="Hand"
<TextBlock Margin="10 0 0 0" Text="Query time: 0ms" x:Name="pluginQueryTime"></TextBlock> MouseUp="PluginActionKeywords_OnMouseUp" Foreground="Blue" Text="keys"
<TextBlock HorizontalAlignment="Right" Cursor="Hand" MouseUp="tbOpenPluginDirecoty_MouseUp" Foreground="Blue" Text="{DynamicResource pluginDirectory}" x:Name="tbOpenPluginDirecoty"></TextBlock> x:Name="pluginActionKeywords" />
<TextBlock Margin="10 0 0 0" Text="Init time: 0ms" x:Name="pluginInitTime" />
<TextBlock Margin="10 0 0 0" Text="Query time: 0ms" x:Name="pluginQueryTime" />
<TextBlock HorizontalAlignment="Right" Cursor="Hand"
MouseUp="tbOpenPluginDirecoty_MouseUp" Foreground="Blue"
Text="{DynamicResource pluginDirectory}" x:Name="tbOpenPluginDirecoty" />
</DockPanel> </DockPanel>
</Grid> </Grid>
</Grid> </Grid>
</ContentControl> </ContentControl>
<ContentControl x:Name="PluginContentPanel" Grid.ColumnSpan="1" Grid.Row="1" Margin="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <ContentControl x:Name="PluginContentPanel" Grid.ColumnSpan="1" Grid.Row="1" Margin="0"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
</ContentControl>
</Grid> </Grid>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="{DynamicResource theme}" x:Name="tabTheme"> <TabItem Header="{DynamicResource theme}" x:Name="tabTheme">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200"/> <ColumnDefinition Width="200" />
<ColumnDefinition/> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<DockPanel Grid.Column="0" > <DockPanel Grid.Column="0">
<TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Left" Cursor="Hand" MouseUp="tbMoreThemes_MouseUp" x:Name="tbMoreThemes" Foreground="Blue" Text="{DynamicResource browserMoreThemes}"></TextBlock> <TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Left" Cursor="Hand"
<ListBox x:Name="themeComboBox" Margin="10, 0, 10, 10" SelectionChanged="ThemeComboBox_OnSelectionChanged" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Width="180"/> MouseUp="tbMoreThemes_MouseUp" x:Name="tbMoreThemes" Foreground="Blue"
Text="{DynamicResource browserMoreThemes}" />
<ListBox x:Name="themeComboBox" Margin="10, 0, 10, 10"
SelectionChanged="ThemeComboBox_OnSelectionChanged" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Width="180" />
</DockPanel> </DockPanel>
<Grid Margin="0" Grid.Column="1"> <Grid Margin="0" Grid.Column="1">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition /> <RowDefinition />
<RowDefinition Height="100"/> <RowDefinition Height="100" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel x:Name="PreviewPanel" Grid.Row="0" Margin="0"> <StackPanel x:Name="PreviewPanel" Grid.Row="0" Margin="0">
<StackPanel x:Name="PreviewMainPanel" Orientation="Horizontal" Margin="10" HorizontalAlignment="Center" VerticalAlignment="Center"> <StackPanel x:Name="PreviewMainPanel" Orientation="Horizontal" Margin="10"
HorizontalAlignment="Center" VerticalAlignment="Center">
<Border Width="500" Style="{DynamicResource WindowBorderStyle}"> <Border Width="500" Style="{DynamicResource WindowBorderStyle}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="50" /> <RowDefinition Height="50" />
<RowDefinition/> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBox Text="{DynamicResource helloWox}" IsReadOnly="True" Style="{DynamicResource QueryBoxStyle}" Grid.Row="0"/> <TextBox Text="{DynamicResource helloWox}" IsReadOnly="True"
<wox:ResultListBox Grid.Row="1" x:Name="ResultListBoxPreview"/> Style="{DynamicResource QueryBoxStyle}" Grid.Row="0" />
<wox:ResultListBox Grid.Row="1" x:Name="ResultListBoxPreview" />
</Grid> </Grid>
</Border> </Border>
</StackPanel> </StackPanel>
@@ -158,10 +183,15 @@
<StackPanel Grid.Row="1" Margin="0 10 0 10" Orientation="Vertical"> <StackPanel Grid.Row="1" Margin="0 10 0 10" Orientation="Vertical">
<StackPanel Orientation="Horizontal" Margin="2"> <StackPanel Orientation="Horizontal" Margin="2">
<TextBlock Text="{DynamicResource queryBoxFont}" /> <TextBlock Text="{DynamicResource queryBoxFont}" />
<ComboBox Margin="10 -2 5 0" x:Name="cbQueryBoxFont" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="CbQueryBoxFont_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160"/> <ComboBox Margin="10 -2 5 0" x:Name="cbQueryBoxFont"
ItemsSource="{x:Static Fonts.SystemFontFamilies}"
SelectionChanged="CbQueryBoxFont_OnSelectionChanged" HorizontalAlignment="Left"
VerticalAlignment="Top" Width="160" />
<ComboBox Margin="0 -2 0 0" <ComboBox Margin="0 -2 0 0"
x:Name="cbQueryBoxFontFaces" x:Name="cbQueryBoxFontFaces"
ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=cbQueryBoxFont}" SelectionChanged="CbQueryBoxFontFaces_OnSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120"> ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=cbQueryBoxFont}"
SelectionChanged="CbQueryBoxFontFaces_OnSelectionChanged"
HorizontalAlignment="Left" VerticalAlignment="Top" Width="120">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<ItemsControl ItemsSource="{Binding AdjustedFaceNames}"> <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
@@ -177,10 +207,15 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Margin="2"> <StackPanel Orientation="Horizontal" Margin="2">
<TextBlock Text="{DynamicResource resultItemFont}" /> <TextBlock Text="{DynamicResource resultItemFont}" />
<ComboBox Margin="5 -2 5 0" x:Name="ResultFontComboBox" ItemsSource="{x:Static Fonts.SystemFontFamilies}" SelectionChanged="OnResultFontSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="160"/> <ComboBox Margin="5 -2 5 0" x:Name="ResultFontComboBox"
ItemsSource="{x:Static Fonts.SystemFontFamilies}"
SelectionChanged="OnResultFontSelectionChanged" HorizontalAlignment="Left"
VerticalAlignment="Top" Width="160" />
<ComboBox Margin="0 -2 0 0" <ComboBox Margin="0 -2 0 0"
x:Name="ResultFontFacesComboBox" x:Name="ResultFontFacesComboBox"
ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=ResultFontComboBox}" SelectionChanged="OnResultFontFacesSelectionChanged" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120"> ItemsSource="{Binding SelectedValue.FamilyTypefaces, ElementName=ResultFontComboBox}"
SelectionChanged="OnResultFontFacesSelectionChanged" HorizontalAlignment="Left"
VerticalAlignment="Top" Width="120">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<ItemsControl ItemsSource="{Binding AdjustedFaceNames}"> <ItemsControl ItemsSource="{Binding AdjustedFaceNames}">
@@ -202,34 +237,35 @@
<TabItem Header="{DynamicResource hotkey}" x:Name="tabHotkey"> <TabItem Header="{DynamicResource hotkey}" x:Name="tabHotkey">
<Grid Margin="10"> <Grid Margin="10">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="30"/> <RowDefinition Height="30" />
<RowDefinition/> <RowDefinition />
<RowDefinition Height="50"/> <RowDefinition Height="50" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center"> <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock VerticalAlignment="Center" Margin="0 0 10 0" Text="{DynamicResource woxHotkey}"></TextBlock> <TextBlock VerticalAlignment="Center" Margin="0 0 10 0" Text="{DynamicResource woxHotkey}" />
<wox:HotkeyControl x:Name="ctlHotkey"/> <wox:HotkeyControl x:Name="ctlHotkey" />
</StackPanel> </StackPanel>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="20"/> <RowDefinition Height="20" />
<RowDefinition/> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock VerticalAlignment="Center" Grid.Row="0" Margin="0 0 10 0" Text="{DynamicResource customQueryHotkey}"></TextBlock> <TextBlock VerticalAlignment="Center" Grid.Row="0" Margin="0 0 10 0"
Text="{DynamicResource customQueryHotkey}" />
<ListView x:Name="lvCustomHotkey" Margin="0 5 0 0" Grid.Row="1"> <ListView x:Name="lvCustomHotkey" Margin="0 5 0 0" Grid.Row="1">
<ListView.View> <ListView.View>
<GridView> <GridView>
<GridViewColumn Header="{DynamicResource hotkey}" Width="180"> <GridViewColumn Header="{DynamicResource hotkey}" Width="180">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Hotkey}"/> <TextBlock Text="{Binding Hotkey}" />
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Header="{DynamicResource actionKeywords}" Width="500"> <GridViewColumn Header="{DynamicResource actionKeywords}" Width="500">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding ActionKeywords}"/> <TextBlock Text="{Binding ActionKeywords}" />
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
@@ -239,56 +275,61 @@
</Grid> </Grid>
<StackPanel Grid.Row="2" HorizontalAlignment="Right" Orientation="Horizontal"> <StackPanel Grid.Row="2" HorizontalAlignment="Right" Orientation="Horizontal">
<Button x:Name="btnDeleteCustomHotkey" Click="BtnDeleteCustomHotkey_OnClick" Width="100" Margin="10" Content="{DynamicResource delete}"/> <Button x:Name="btnDeleteCustomHotkey" Click="BtnDeleteCustomHotkey_OnClick" Width="100"
<Button x:Name="btnEditCustomHotkey" Click="BtnEditCustomHotkey_OnClick" Width="100" Margin="10" Content="{DynamicResource edit}"/> Margin="10" Content="{DynamicResource delete}" />
<Button x:Name="btnAddCustomeHotkey" Click="BtnAddCustomeHotkey_OnClick" Width="100" Margin="10" Content="{DynamicResource add}"/> <Button x:Name="btnEditCustomHotkey" Click="BtnEditCustomHotkey_OnClick" Width="100" Margin="10"
Content="{DynamicResource edit}" />
<Button x:Name="btnAddCustomeHotkey" Click="BtnAddCustomeHotkey_OnClick" Width="100" Margin="10"
Content="{DynamicResource add}" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="{DynamicResource proxy}"> <TabItem Header="{DynamicResource proxy}">
<StackPanel> <StackPanel>
<CheckBox x:Name="cbEnableProxy" Margin="10"> <CheckBox x:Name="cbEnableProxy" Margin="10">
<TextBlock Text="{DynamicResource enableProxy}"></TextBlock> <TextBlock Text="{DynamicResource enableProxy}" />
</CheckBox> </CheckBox>
<Grid Margin="10"> <Grid Margin="10">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition ></RowDefinition> <RowDefinition />
<RowDefinition ></RowDefinition> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80" />
<ColumnDefinition Width="220"></ColumnDefinition> <ColumnDefinition Width="220" />
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80" />
<ColumnDefinition></ColumnDefinition> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Grid.Row="0" Grid.Column="0" Padding="5"> <Border Grid.Row="0" Grid.Column="0" Padding="5">
<TextBlock Text="{DynamicResource server}"></TextBlock> <TextBlock Text="{DynamicResource server}" />
</Border> </Border>
<Border Grid.Row="0" Grid.Column="1" Padding="5"> <Border Grid.Row="0" Grid.Column="1" Padding="5">
<TextBox Width="200" HorizontalAlignment="Left" x:Name="tbProxyServer"></TextBox> <TextBox Width="200" HorizontalAlignment="Left" x:Name="tbProxyServer" />
</Border> </Border>
<Border Grid.Row="0" Grid.Column="2" Padding="5"> <Border Grid.Row="0" Grid.Column="2" Padding="5">
<TextBlock Text="{DynamicResource port}"></TextBlock> <TextBlock Text="{DynamicResource port}" />
</Border> </Border>
<Border Grid.Row="0" Grid.Column="3" Padding="5"> <Border Grid.Row="0" Grid.Column="3" Padding="5">
<TextBox Width="50" HorizontalAlignment="Left" x:Name="tbProxyPort"></TextBox> <TextBox Width="50" HorizontalAlignment="Left" x:Name="tbProxyPort" />
</Border> </Border>
<Border Grid.Row="1" Grid.Column="0" Padding="5"> <Border Grid.Row="1" Grid.Column="0" Padding="5">
<TextBlock Text="{DynamicResource userName}"></TextBlock> <TextBlock Text="{DynamicResource userName}" />
</Border> </Border>
<Border Grid.Row="1" Grid.Column="1" Padding="5"> <Border Grid.Row="1" Grid.Column="1" Padding="5">
<TextBox Width="200" HorizontalAlignment="Left" x:Name="tbProxyUserName"></TextBox> <TextBox Width="200" HorizontalAlignment="Left" x:Name="tbProxyUserName" />
</Border> </Border>
<Border Grid.Row="1" Grid.Column="2" Padding="5"> <Border Grid.Row="1" Grid.Column="2" Padding="5">
<TextBlock Text="{DynamicResource password}"></TextBlock> <TextBlock Text="{DynamicResource password}" />
</Border> </Border>
<Border Grid.Row="1" Grid.Column="3" Padding="5"> <Border Grid.Row="1" Grid.Column="3" Padding="5">
<PasswordBox Width="200" HorizontalAlignment="Left" x:Name="tbProxyPassword" /> <PasswordBox Width="200" HorizontalAlignment="Left" x:Name="tbProxyPassword" />
</Border> </Border>
</Grid> </Grid>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Button x:Name="btnTestProxy" Width="80" HorizontalAlignment="Left" Margin="10" Click="btnTestProxy_Click" Content="{DynamicResource testProxy}"></Button> <Button x:Name="btnTestProxy" Width="80" HorizontalAlignment="Left" Margin="10"
<Button x:Name="btnSaveProxy" Width="80" HorizontalAlignment="Left" Margin="10" Click="btnSaveProxy_Click" Content="{DynamicResource save}"></Button> Click="btnTestProxy_Click" Content="{DynamicResource testProxy}" />
<Button x:Name="btnSaveProxy" Width="80" HorizontalAlignment="Left" Margin="10"
Click="btnSaveProxy_Click" Content="{DynamicResource save}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</TabItem> </TabItem>
@@ -300,25 +341,28 @@
</Style> </Style>
</Grid.Resources> </Grid.Resources>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="80"></ColumnDefinition> <ColumnDefinition Width="80" />
<ColumnDefinition></ColumnDefinition> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource website}"></TextBlock> <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource website}" />
<TextBlock Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" Cursor="Hand" MouseUp="tbWebsite_MouseUp" x:Name="tbWebsite" Foreground="Blue" Text="http://www.getwox.com"></TextBlock> <TextBlock Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" Cursor="Hand"
MouseUp="tbWebsite_MouseUp" x:Name="tbWebsite" Foreground="Blue"
Text="http://www.getwox.com" />
<TextBlock Grid.Column="0" Grid.Row="1" Text="{DynamicResource version}"></TextBlock> <TextBlock Grid.Column="0" Grid.Row="1" Text="{DynamicResource version}" />
<StackPanel Grid.Column="1" Grid.Row="1" Orientation="Horizontal"> <StackPanel Grid.Column="1" Grid.Row="1" Orientation="Horizontal">
<TextBlock HorizontalAlignment="Left" x:Name="tbVersion" Text="1.0.0"></TextBlock> <TextBlock HorizontalAlignment="Left" x:Name="tbVersion" Text="1.0.0" />
</StackPanel> </StackPanel>
<TextBlock x:Name="tbActivatedTimes" Grid.Row="2" Grid.ColumnSpan="2" Text="{DynamicResource about_activate_times}"></TextBlock> <TextBlock x:Name="tbActivatedTimes" Grid.Row="2" Grid.ColumnSpan="2"
Text="{DynamicResource about_activate_times}" />
</Grid> </Grid>
</TabItem> </TabItem>
</TabControl> </TabControl>
</Window> </Window>

View File

@@ -8,38 +8,39 @@
Title="{DynamicResource update_wox_update}" Height="400" Width="600"> Title="{DynamicResource update_wox_update}" Height="400" Width="600">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="100"></ColumnDefinition> <ColumnDefinition Width="100" />
<ColumnDefinition></ColumnDefinition> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="80"></RowDefinition> <RowDefinition Height="80" />
<RowDefinition ></RowDefinition> <RowDefinition />
<RowDefinition Height="50"></RowDefinition> <RowDefinition Height="50" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Image Source="Images/update.png" Width="64"></Image> <Image Source="Images/update.png" Width="64" />
<TextBlock x:Name="tbNewVersionAvailable" Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" FontSize="20" Text="{DynamicResource update_wox_update_new_version_available}"></TextBlock> <TextBlock x:Name="tbNewVersionAvailable" Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" FontSize="20"
Text="{DynamicResource update_wox_update_new_version_available}" />
<TabControl Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"> <TabControl Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2">
<TabItem Header="{DynamicResource update_wox_update_upadte_description}"> <TabItem Header="{DynamicResource update_wox_update_upadte_description}">
<WebBrowser x:Name="wbDetails" Grid.Row="1"></WebBrowser> <WebBrowser x:Name="wbDetails" Grid.Row="1" />
</TabItem> </TabItem>
<TabItem Header="{DynamicResource update_wox_update_files}"> <TabItem Header="{DynamicResource update_wox_update_files}">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition> <RowDefinition Height="30" />
<RowDefinition></RowDefinition> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Row="0" Padding="8" Text="{DynamicResource update_wox_update_upadte_files}"></TextBlock> <TextBlock Grid.Row="0" Padding="8" Text="{DynamicResource update_wox_update_upadte_files}" />
<ListBox x:Name="lbUpdatedFiles" Grid.Row="1"> <ListBox x:Name="lbUpdatedFiles" Grid.Row="1" />
</ListBox>
</Grid> </Grid>
</TabItem> </TabItem>
</TabControl> </TabControl>
<StackPanel Grid.Column="1" Grid.Row="4" HorizontalAlignment="Right" Orientation="Horizontal"> <StackPanel Grid.Column="1" Grid.Row="4" HorizontalAlignment="Right" Orientation="Horizontal">
<TextBlock Foreground="Gray" TextAlignment="Center" Margin="0 0 10 0" VerticalAlignment="Center" Text="{DynamicResource update_wox_update_restart_wox_tip}"></TextBlock> <TextBlock Foreground="Gray" TextAlignment="Center" Margin="0 0 10 0" VerticalAlignment="Center"
<Button x:Name="btnUpdate" Padding="8 3" Margin="8" Click="btnUpdate_Click" Content="{DynamicResource update_wox_update}"> Text="{DynamicResource update_wox_update_restart_wox_tip}" />
</Button> <Button x:Name="btnUpdate" Padding="8 3" Margin="8" Click="btnUpdate_Click"
<Button x:Name="btnCancel" Padding="8 3" Margin="8" Click="btnCancel_Click" Content="{DynamicResource update_wox_update_cancel}"> Content="{DynamicResource update_wox_update}" />
</Button> <Button x:Name="btnCancel" Padding="8 3" Margin="8" Click="btnCancel_Click"
Content="{DynamicResource update_wox_update_cancel}" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Window> </Window>

View File

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Exceptionless" version="1.5.2121" targetFramework="net452" /> <package id="Exceptionless" version="1.5.2121" targetFramework="net452" />
<package id="InputSimulator" version="1.0.4.0" targetFramework="net452" /> <package id="InputSimulator" version="1.0.4.0" targetFramework="net452" />