prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- Move the 'Shorcut' to Hotkey tab from General

Browse source 
- Adjust Layout
This commit is contained in:
DB p 2022-03-02 06:49:54 +09:00
parent b837d450d5
commit 4d42e52dc1
1 changed files with 207 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

371
Flow.Launcher/SettingWindow.xaml
View file

@ -875,31 +875,6 @@
SelectedValuePath="LanguageCode" /> SelectedValuePath="LanguageCode" />
</ItemsControl> </ItemsControl>
</Border> </Border>
<Border Style="{DynamicResource SettingGroupBox}">
<StackPanel Margin="10" Orientation="Vertical">
<TextBlock Margin="10" Text="ShortCut" />
<ListView ItemsSource="{Binding ShortCuts}">
<ListView.View>
<GridView>
<GridViewColumn Header="Key">
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Key}" />
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Header="Mapped Value">
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Value}" />
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
</GridView>
</ListView.View>
</ListView>
</StackPanel>
</Border>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
</TabItem> </TabItem>
@ -2026,11 +2001,8 @@
<Grid Margin="5,18,18,10"> <Grid Margin="5,18,18,10">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="43" /> <RowDefinition Height="43" />
<RowDefinition Height="80" />
<RowDefinition Height="146" />
<RowDefinition Height="50" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="50" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
@ -2041,147 +2013,218 @@
TextAlignment="left" /> TextAlignment="left" />
<StackPanel Grid.Row="1"> <StackPanel Grid.Row="1">
<Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}"> <Border
<ItemsControl Style="{StaticResource SettingGrid}"> Margin="0,12,0,0"
<StackPanel Style="{StaticResource TextPanel}"> Padding="0"
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource flowlauncherHotkey}" /> CornerRadius="5"
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource flowlauncherHotkeyToolTip}" /> Style="{DynamicResource SettingGroupBox}">
</StackPanel> <StackPanel Orientation="Vertical">
<flowlauncher:HotkeyControl <Border
x:Name="HotkeyControl" Margin="0"
Grid.Row="0" BorderThickness="0"
Grid.Column="2" Style="{DynamicResource SettingGroupBox}">
Width="300" <ItemsControl Style="{StaticResource SettingGrid}">
Height="35" <StackPanel Style="{StaticResource TextPanel}">
Margin="0,0,0,0" <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource flowlauncherHotkey}" />
HorizontalAlignment="Right" <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource flowlauncherHotkeyToolTip}" />
HorizontalContentAlignment="Right" </StackPanel>
GotFocus="OnHotkeyControlFocused" <flowlauncher:HotkeyControl
Loaded="OnHotkeyControlLoaded" x:Name="HotkeyControl"
LostFocus="OnHotkeyControlFocusLost" /> Grid.Row="0"
Grid.Column="2"
Width="300"
Height="35"
Margin="0,0,0,0"
HorizontalAlignment="Right"
HorizontalContentAlignment="Right"
GotFocus="OnHotkeyControlFocused"
Loaded="OnHotkeyControlLoaded"
LostFocus="OnHotkeyControlFocusLost" />
<TextBlock Style="{StaticResource Glyph}">
&#xeda7;
</TextBlock>
</ItemsControl>
</Border>
</StackPanel>
<TextBlock Style="{StaticResource Glyph}">
&#xeda7;
</TextBlock>
</ItemsControl>
</Border> </Border>
</StackPanel>
<Border <Border
Grid.Row="2" Margin="0,20,0,0"
Margin="0,12,0,0" Padding="0"
Padding="0" CornerRadius="5"
CornerRadius="5" Style="{DynamicResource SettingGroupBox}">
Style="{DynamicResource SettingGroupBox}"> <StackPanel Orientation="Vertical">
<StackPanel Orientation="Vertical"> <Border
<Border Margin="0"
Margin="0" BorderThickness="0"
BorderThickness="0" Style="{DynamicResource SettingGroupBox}">
Style="{DynamicResource SettingGroupBox}"> <ItemsControl Style="{StaticResource SettingGrid}">
<ItemsControl Style="{StaticResource SettingGrid}"> <StackPanel Style="{StaticResource TextPanel}">
<StackPanel Style="{StaticResource TextPanel}"> <TextBlock
<TextBlock Grid.Column="1"
Grid.Column="1" VerticalAlignment="Center"
VerticalAlignment="Center" Style="{DynamicResource SettingTitleLabel}"
Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource openResultModifiers}" />
Text="{DynamicResource openResultModifiers}" /> <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource openResultModifiersToolTip}" />
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource openResultModifiersToolTip}" /> </StackPanel>
</StackPanel> <ComboBox
<ComboBox Grid.Column="2"
Grid.Column="2" Width="120"
Width="120" Margin="0,0,18,0"
Margin="0,0,18,0" FontSize="14"
FontSize="14" ItemsSource="{Binding OpenResultModifiersList}"
ItemsSource="{Binding OpenResultModifiersList}" SelectedItem="{Binding Settings.OpenResultModifiers}" />
SelectedItem="{Binding Settings.OpenResultModifiers}" /> </ItemsControl>
</ItemsControl> </Border>
</Border>
<Separator <Separator
Width="Auto" Width="Auto"
BorderThickness="1" BorderThickness="1"
Style="{StaticResource SettingSeparatorStyle}" /> Style="{StaticResource SettingSeparatorStyle}" />
<Border <Border
Margin="0" Margin="0"
Padding="0,10,0,0" Padding="0,14,0,14"
BorderThickness="0" BorderThickness="0"
Style="{DynamicResource SettingGroupBox}"> Style="{DynamicResource SettingGroupBox}">
<ItemsControl Style="{StaticResource SettingGrid}"> <ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}"> <StackPanel Style="{StaticResource TextPanel}">
<TextBlock <TextBlock
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{DynamicResource SettingTitleLabel}" Style="{DynamicResource SettingTitleLabel}"
Text="{DynamicResource showOpenResultHotkey}" /> Text="{DynamicResource showOpenResultHotkey}" />
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource showOpenResultHotkeyToolTip}" /> <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource showOpenResultHotkeyToolTip}" />
</StackPanel> </StackPanel>
<CheckBox <CheckBox
Grid.Column="2" Grid.Column="2"
FontSize="14" FontSize="14"
IsChecked="{Binding Settings.ShowOpenResultHotkey}" IsChecked="{Binding Settings.ShowOpenResultHotkey}"
Style="{DynamicResource SideControlCheckBox}" /> Style="{DynamicResource SideControlCheckBox}" />
</ItemsControl> </ItemsControl>
</Border> </Border>
</StackPanel>
</Border>
<TextBlock
Margin="0,8,12,2"
Padding="0,12,0,0"
VerticalAlignment="Center"
FontSize="14"
Foreground="{DynamicResource Color05B}"
Text="{DynamicResource customQueryHotkey}" />
<ListView
MinHeight="155"
Margin="0,6,0,0"
Background="{DynamicResource Color02B}"
BorderBrush="DarkGray"
BorderThickness="1"
ItemsSource="{Binding Settings.CustomPluginHotkeys}"
SelectedItem="{Binding SelectedCustomPluginHotkey}"
Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
<ListView.View>
<GridView>
<GridViewColumn Width="180" Header="{DynamicResource hotkey}">
<GridViewColumn.CellTemplate>
<DataTemplate DataType="userSettings:CustomPluginHotkey">
<TextBlock Text="{Binding Hotkey}" />
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Width="540" Header="{DynamicResource customQuery}">
<GridViewColumn.CellTemplate>
<DataTemplate DataType="userSettings:CustomPluginHotkey">
<TextBlock Text="{Binding ActionKeyword}" />
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
</GridView>
</ListView.View>
</ListView>
<StackPanel
Margin="0"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Orientation="Horizontal">
<Button
MinWidth="100"
Margin="10"
Click="OnDeleteCustomHotkeyClick"
Content="{DynamicResource delete}" />
<Button
MinWidth="100"
Margin="10"
Click="OnnEditCustomHotkeyClick"
Content="{DynamicResource edit}" />
<Button
MinWidth="100"
Margin="10,10,0,10"
Click="OnAddCustomeHotkeyClick"
Content="{DynamicResource add}" />
</StackPanel> </StackPanel>
</Border>
<TextBlock
Grid.Row="3" <TextBlock
Margin="0,0,12,2" Margin="0,0,12,2"
Padding="0,12,0,0" Padding="0,12,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="14" FontSize="14"
Foreground="{DynamicResource Color05B}" Foreground="{DynamicResource Color05B}"
Text="{DynamicResource customQueryHotkey}" /> Text="Shortcut" />
<ListView <ListView
Grid.Row="4" MinHeight="185"
Margin="0,0,0,0" Margin="0,6,0,0"
Background="{DynamicResource Color02B}" Background="{DynamicResource Color02B}"
BorderBrush="DarkGray" BorderBrush="DarkGray"
BorderThickness="1" BorderThickness="1"
ItemsSource="{Binding Settings.CustomPluginHotkeys}" ItemsSource="{Binding ShortCuts}"
SelectedItem="{Binding SelectedCustomPluginHotkey}" SelectedItem="{Binding SelectedCustomPluginHotkey}"
Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"> Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
<ListView.View> <ListView.View>
<GridView> <GridView>
<GridViewColumn Width="180" Header="{DynamicResource hotkey}"> <GridViewColumn Header="Key">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate DataType="userSettings:CustomPluginHotkey"> <DataTemplate>
<TextBlock Text="{Binding Hotkey}" /> <TextBlock Text="{Binding Key}" />
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
<GridViewColumn Width="540" Header="{DynamicResource customQuery}"> <GridViewColumn Header="Mapped Value">
<GridViewColumn.CellTemplate> <GridViewColumn.CellTemplate>
<DataTemplate DataType="userSettings:CustomPluginHotkey"> <DataTemplate>
<TextBlock Text="{Binding ActionKeyword}" /> <TextBlock Text="{Binding Value}" />
</DataTemplate> </DataTemplate>
</GridViewColumn.CellTemplate> </GridViewColumn.CellTemplate>
</GridViewColumn> </GridViewColumn>
</GridView> </GridView>
</ListView.View> </ListView.View>
</ListView> </ListView>
<StackPanel <StackPanel
Grid.Row="5" Margin="0"
Margin="0" HorizontalAlignment="Right"
HorizontalAlignment="Right" VerticalAlignment="Top"
VerticalAlignment="Top" Orientation="Horizontal">
Orientation="Horizontal"> <Button
<Button MinWidth="100"
MinWidth="100" Margin="10"
Margin="10" Click="OnDeleteCustomHotkeyClick"
Click="OnDeleteCustomHotkeyClick" Content="{DynamicResource delete}" />
Content="{DynamicResource delete}" /> <Button
<Button MinWidth="100"
MinWidth="100" Margin="10"
Margin="10" Click="OnnEditCustomHotkeyClick"
Click="OnnEditCustomHotkeyClick" Content="{DynamicResource edit}" />
Content="{DynamicResource edit}" /> <Button
<Button MinWidth="100"
MinWidth="100" Margin="10,10,0,10"
Margin="10,10,0,10" Click="OnAddCustomeHotkeyClick"
Click="OnAddCustomeHotkeyClick" Content="{DynamicResource add}" />
Content="{DynamicResource add}" /> </StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>