This commit is contained in:
bao-qian
2016-05-22 05:47:10 +01:00
parent 7056be0870
commit 826a69c531
2 changed files with 16 additions and 22 deletions

View File

@@ -3,7 +3,6 @@
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:image="clr-namespace:Wox.Infrastructure.Image;assembly=Wox.Infrastructure"
xmlns:vm="clr-namespace:Wox.ViewModel" xmlns:vm="clr-namespace:Wox.ViewModel"
mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100" mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100"
d:DataContext="{d:DesignInstance vm:ResultsViewModel}" d:DataContext="{d:DesignInstance vm:ResultsViewModel}"
@@ -19,9 +18,6 @@
<!--IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083--> <!--IsSynchronizedWithCurrentItem: http://stackoverflow.com/a/7833798/2833083-->
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<DataTemplate.DataType>
<x:Type TypeName="vm:ResultViewModel" />
</DataTemplate.DataType>
<Button> <Button>
<Button.Template> <Button.Template>
<ControlTemplate> <ControlTemplate>

View File

@@ -1,19 +1,17 @@
<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: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:wox="clr-namespace:Wox"
xmlns:wox="clr-namespace:Wox" xmlns:vm="clr-namespace:Wox.ViewModel"
xmlns:vm="clr-namespace:Wox.ViewModel" x:Class="Wox.SettingWindow"
xmlns:image="clr-namespace:Wox.Infrastructure.Image;assembly=Wox.Infrastructure" mc:Ignorable="d"
x:Class="Wox.SettingWindow" Icon="Images\app.png"
mc:Ignorable="d" Title="{DynamicResource wox_settings}"
Icon="Images\app.png" ResizeMode="NoResize"
Title="{DynamicResource wox_settings}" WindowStartupLocation="CenterScreen"
ResizeMode="NoResize" Height="600" Width="800" PreviewKeyDown="Window_PreviewKeyDown"
WindowStartupLocation="CenterScreen" d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}">
Height="600" Width="800" PreviewKeyDown="Window_PreviewKeyDown"
d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}">
<TabControl Height="auto" SelectedIndex="{Binding SelectedTab}"> <TabControl Height="auto" SelectedIndex="{Binding SelectedTab}">
<TabItem Header="{DynamicResource general}" Height="24" VerticalAlignment="Top"> <TabItem Header="{DynamicResource general}" Height="24" VerticalAlignment="Top">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
@@ -72,9 +70,9 @@
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal" Margin="3"> <StackPanel Orientation="Horizontal" Margin="3">
<Image Source="{Binding Image, IsAsync=True}" <Image Source="{Binding Image, IsAsync=True}"
Width="32" Height="32" /> Width="32" Height="32" />
<StackPanel Margin="3 0 3 0"> <StackPanel Margin="3 0 3 0">
<TextBlock Text="{Binding Metadata.Name}" <TextBlock Text="{Binding Metadata.Name}"
ToolTip="{Binding Metadata.Name}" /> ToolTip="{Binding Metadata.Name}" />
<TextBlock Text="{Binding Metadata.Description}" <TextBlock Text="{Binding Metadata.Description}"
ToolTip="{Binding Metadata.Description}" ToolTip="{Binding Metadata.Description}"