- Change Preview Item to non-clickable

- Fix Margin when change shadow setting
- Change Preview Item Texts to translatable
This commit is contained in:
DB p 2022-11-28 03:13:28 +09:00
parent 748e7f11ef
commit 0298f17a2b
3 changed files with 29 additions and 13 deletions

View file

@ -116,6 +116,14 @@
<system:String x:Key="browserMoreThemes">Theme Gallery</system:String> <system:String x:Key="browserMoreThemes">Theme Gallery</system:String>
<system:String x:Key="howToCreateTheme">How to create a theme</system:String> <system:String x:Key="howToCreateTheme">How to create a theme</system:String>
<system:String x:Key="hiThere">Hi There</system:String> <system:String x:Key="hiThere">Hi There</system:String>
<system:String x:Key="SampleTitleExplorer">Explorer</system:String>
<system:String x:Key="SampleSubTitleExplorer">Search for files, folders and file contents</system:String>
<system:String x:Key="SampleTitleWebSearch">WebSearch</system:String>
<system:String x:Key="SampleSubTitleWebSearch">Search the web with different search engine support</system:String>
<system:String x:Key="SampleTitleProgram">Program</system:String>
<system:String x:Key="SampleSubTitleProgram">Launch programs as admin or a different user</system:String>
<system:String x:Key="SampleTitleProcessKiller">ProcessKiller</system:String>
<system:String x:Key="SampleSubTitleProcessKiller">Terminate unwanted processes</system:String>
<system:String x:Key="queryBoxFont">Query Box Font</system:String> <system:String x:Key="queryBoxFont">Query Box Font</system:String>
<system:String x:Key="resultItemFont">Result Item Font</system:String> <system:String x:Key="resultItemFont">Result Item Font</system:String>
<system:String x:Key="windowMode">Window Mode</system:String> <system:String x:Key="windowMode">Window Mode</system:String>

View file

@ -443,10 +443,9 @@
Margin="2,2,2,0" Margin="2,2,2,0"
Panel.ZIndex="1" Panel.ZIndex="1"
Background="Transparent" Background="Transparent"
IsItemsHost="true" IsItemsHost="true"
LastChildFill="False" /> LastChildFill="False" />
<Border <Border Grid.Column="1">
Grid.Column="1">
<ContentPresenter Grid.Column="1" ContentSource="SelectedContent" /> <ContentPresenter Grid.Column="1" ContentSource="SelectedContent" />
</Border> </Border>
</Grid> </Grid>
@ -1779,7 +1778,12 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Orientation="Horizontal"> Orientation="Horizontal">
<Border Width="{Binding WindowWidthSize}" Style="{DynamicResource WindowBorderStyle}"> <Border
Width="{Binding WindowWidthSize}"
Margin="0"
SnapsToDevicePixels="True"
Style="{DynamicResource WindowBorderStyle}"
UseLayoutRounding="True">
<Border Style="{DynamicResource WindowRadius}"> <Border Style="{DynamicResource WindowRadius}">
<Border.Clip> <Border.Clip>
<MultiBinding Converter="{StaticResource BorderClipConverter}"> <MultiBinding Converter="{StaticResource BorderClipConverter}">
@ -1797,6 +1801,7 @@
<Border Grid.Row="0"> <Border Grid.Row="0">
<TextBox <TextBox
x:Name="QueryTextBox" x:Name="QueryTextBox"
IsHitTestVisible="False"
IsReadOnly="True" IsReadOnly="True"
Style="{DynamicResource QueryBoxStyle}" Style="{DynamicResource QueryBoxStyle}"
Text="{DynamicResource hiThere}" /> Text="{DynamicResource hiThere}" />
@ -1834,7 +1839,10 @@
</Border> </Border>
<ContentControl Grid.Row="2"> <ContentControl Grid.Row="2">
<flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" /> <flowlauncher:ResultListBox
DataContext="{Binding PreviewResults, Mode=OneTime}"
IsHitTestVisible="False"
Visibility="Visible" />
</ContentControl> </ContentControl>
</Grid> </Grid>

View file

@ -609,26 +609,26 @@ namespace Flow.Launcher.ViewModel
{ {
new Result new Result
{ {
Title = "Explorer", Title = InternationalizationManager.Instance.GetTranslation("SampleTitleExplorer"),
SubTitle = "Search for files, folders and file contents", SubTitle = InternationalizationManager.Instance.GetTranslation("SampleSubTitleExplorer"),
IcoPath = Path.Combine(Constant.ProgramDirectory, @"Plugins\Flow.Launcher.Plugin.Explorer\Images\explorer.png") IcoPath = Path.Combine(Constant.ProgramDirectory, @"Plugins\Flow.Launcher.Plugin.Explorer\Images\explorer.png")
}, },
new Result new Result
{ {
Title = "WebSearch", Title = InternationalizationManager.Instance.GetTranslation("SampleTitleWebSearch"),
SubTitle = "Search the web with different search engine support", SubTitle = InternationalizationManager.Instance.GetTranslation("SampleSubTitleWebSearch"),
IcoPath = Path.Combine(Constant.ProgramDirectory, @"Plugins\Flow.Launcher.Plugin.WebSearch\Images\web_search.png") IcoPath = Path.Combine(Constant.ProgramDirectory, @"Plugins\Flow.Launcher.Plugin.WebSearch\Images\web_search.png")
}, },
new Result new Result
{ {
Title = "Program", Title = InternationalizationManager.Instance.GetTranslation("SampleTitleProgram"),
SubTitle = "Launch programs as admin or a different user", SubTitle = InternationalizationManager.Instance.GetTranslation("SampleSubTitleProgram"),
IcoPath = Path.Combine(Constant.ProgramDirectory, @"Plugins\Flow.Launcher.Plugin.Program\Images\program.png") IcoPath = Path.Combine(Constant.ProgramDirectory, @"Plugins\Flow.Launcher.Plugin.Program\Images\program.png")
}, },
new Result new Result
{ {
Title = "ProcessKiller", Title = InternationalizationManager.Instance.GetTranslation("SampleTitleProcessKiller"),
SubTitle = "Terminate unwanted processes", SubTitle = InternationalizationManager.Instance.GetTranslation("SampleSubTitleProcessKiller"),
IcoPath = Path.Combine(Constant.ProgramDirectory, @"Plugins\Flow.Launcher.Plugin.ProcessKiller\Images\app.png") IcoPath = Path.Combine(Constant.ProgramDirectory, @"Plugins\Flow.Launcher.Plugin.ProcessKiller\Images\app.png")
} }
}; };