Skip to content

Commit fe5859a

Browse files
jjw24jjw24
authored
Merge pull request #1478 from VictoriousRaptor/Shortcut
Fix mixed usage of \t and space in Shortcut branch
2 parents 2489bfa + 40dda13 commit fe5859a

File tree

3 files changed

+38
-38
lines changed

3 files changed

+38
-38
lines changed

‎Flow.Launcher/CustomShortcutSetting.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,24 +111,24 @@
111111
FontSize="14"
112112
Text="{DynamicResource customShortcutExpansion}" />
113113

114-
<DockPanel
114+
<DockPanel
115115
Grid.Row="1"
116116
Grid.Column="1"
117117
LastChildFill="True">
118-
<Button
118+
<Button
119119
x:Name="btnTestShortcut"
120120
Padding="10,5,10,5"
121121
Click="BtnTestShortcut_OnClick"
122122
Content="{DynamicResource preview}"
123123
DockPanel.Dock="Right" />
124-
<TextBox
124+
<TextBox
125125
x:Name="tbExpand"
126126
Margin="10"
127127
HorizontalAlignment="Stretch"
128-
Text="{Binding Value}"
128+
Text="{Binding Value}"
129129
VerticalAlignment="Center" />
130-
</DockPanel>
131-
</Grid>
130+
</DockPanel>
131+
</Grid>
132132
</StackPanel>
133133
</StackPanel>
134134
</StackPanel>

‎Flow.Launcher/Languages/en.xaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@
113113
<system:String x:Key="openResultModifiersToolTip">Select a modifier key to open selected result via keyboard.</system:String>
114114
<system:String x:Key="showOpenResultHotkey">Show Hotkey</system:String>
115115
<system:String x:Key="showOpenResultHotkeyToolTip">Show result selection hotkey with results.</system:String>
116-
<system:String x:Key="customQueryHotkey">Custom Query Hotkey</system:String>
117-
<system:String x:Key="customQueryShortcut">Custom Query Shortcut</system:String>
118-
<system:String x:Key="customQuery">Query</system:String>
116+
<system:String x:Key="customQueryHotkey">Custom Query Hotkey</system:String>
117+
<system:String x:Key="customQueryShortcut">Custom Query Shortcut</system:String>
118+
<system:String x:Key="customQuery">Query</system:String>
119119
<system:String x:Key="customShortcut">Shortcut</system:String>
120120
<system:String x:Key="customShortcutExpansion">Expanded</system:String>
121121
<system:String x:Key="delete">Delete</system:String>
@@ -212,13 +212,13 @@
212212
<system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
213213
<system:String x:Key="update">Update</system:String>
214214

215-
<!-- Custom Query Shortcut Dialog -->
216-
<system:String x:Key="customeQueryShortcutTitle">Custom Query Shortcut</system:String>
217-
<system:String x:Key="customeQueryShortcutTips">Enter a shortcut that automatically expands to the specified query.</system:String>
218-
<system:String x:Key="dulplicateShortcut">Shortcut is dulplicate, please enter a new Shortcut or edit the existing one.</system:String>
219-
<system:String x:Key="emptyShortcut">Shortcut and/or its expansion is empty.</system:String>
215+
<!-- Custom Query Shortcut Dialog -->
216+
<system:String x:Key="customeQueryShortcutTitle">Custom Query Shortcut</system:String>
217+
<system:String x:Key="customeQueryShortcutTips">Enter a shortcut that automatically expands to the specified query.</system:String>
218+
<system:String x:Key="dulplicateShortcut">Shortcut is dulplicate, please enter a new Shortcut or edit the existing one.</system:String>
219+
<system:String x:Key="emptyShortcut">Shortcut and/or its expansion is empty.</system:String>
220220

221-
<!-- Hotkey Control -->
221+
<!-- Hotkey Control -->
222222
<system:String x:Key="hotkeyUnavailable">Hotkey Unavailable</system:String>
223223

224224
<!-- Crash Reporter -->

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2194,7 +2194,7 @@
21942194
</DataTemplate>
21952195
</GridViewColumn.CellTemplate>
21962196
</GridViewColumn>
2197-
<GridViewColumn Header="{DynamicResource customShortcutExpansion}">
2197+
<GridViewColumn Header="{DynamicResource customShortcutExpansion}">
21982198
<GridViewColumn.CellTemplate>
21992199
<DataTemplate>
22002200
<TextBlock Text="{Binding Value}" />
@@ -2226,41 +2226,41 @@
22262226
Content="{DynamicResource add}" />
22272227
</StackPanel>
22282228

2229-
<TextBlock
2229+
<TextBlock
22302230
Margin="0,0,12,2"
22312231
Padding="0,12,0,0"
22322232
VerticalAlignment="Center"
22332233
FontSize="14"
22342234
Foreground="{DynamicResource Color05B}"
22352235
Text="Built-in Shortcuts" />
2236-
<ListView
2236+
<ListView
22372237
MinHeight="185"
22382238
Margin="0,6,0,0"
22392239
Background="{DynamicResource Color02B}"
22402240
BorderBrush="DarkGray"
22412241
BorderThickness="1"
22422242
ItemsSource="{Binding Settings.BuiltinShortcuts}"
22432243
Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
2244-
<ListView.View>
2245-
<GridView>
2246-
<GridViewColumn Header="{DynamicResource customShortcut}">
2247-
<GridViewColumn.CellTemplate>
2248-
<DataTemplate>
2249-
<TextBlock Text="{Binding Key}" />
2250-
</DataTemplate>
2251-
</GridViewColumn.CellTemplate>
2252-
</GridViewColumn>
2253-
<GridViewColumn Header="Description">
2254-
<GridViewColumn.CellTemplate>
2255-
<DataTemplate>
2256-
<TextBlock Text="{Binding Description}" />
2257-
</DataTemplate>
2258-
</GridViewColumn.CellTemplate>
2259-
</GridViewColumn>
2260-
</GridView>
2261-
</ListView.View>
2262-
</ListView>
2263-
</StackPanel>
2244+
<ListView.View>
2245+
<GridView>
2246+
<GridViewColumn Header="{DynamicResource customShortcut}">
2247+
<GridViewColumn.CellTemplate>
2248+
<DataTemplate>
2249+
<TextBlock Text="{Binding Key}" />
2250+
</DataTemplate>
2251+
</GridViewColumn.CellTemplate>
2252+
</GridViewColumn>
2253+
<GridViewColumn Header="Description">
2254+
<GridViewColumn.CellTemplate>
2255+
<DataTemplate>
2256+
<TextBlock Text="{Binding Description}" />
2257+
</DataTemplate>
2258+
</GridViewColumn.CellTemplate>
2259+
</GridViewColumn>
2260+
</GridView>
2261+
</ListView.View>
2262+
</ListView>
2263+
</StackPanel>
22642264
</Grid>
22652265
</Border>
22662266
</ScrollViewer>

0 commit comments

Comments
 (0)