Skip to content

Commit d36b8b2

Browse files
Jack251970Jack251970
committed
Resolve conflicts for WelcomePage3
1 parent 5c4c802 commit d36b8b2

File tree

1 file changed

+102
-118
lines changed

1 file changed

+102
-118
lines changed

‎Flow.Launcher/Resources/Pages/WelcomePage3.xaml‎

Lines changed: 102 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@
9090
Background="Transparent"
9191
BorderThickness="0 0 0 0"
9292
Header="{DynamicResource HotkeyRunDesc}">
93-
<cc:HotkeyDisplay Keys="ENTER" Type="Small" />
93+
<StackPanel Orientation="Horizontal">
94+
<cc:HotkeyDisplay Keys="ENTER" Type="Small" />
95+
</StackPanel>
9496
</ui:SettingsCard>
9597
<Border
9698
Height="1"
@@ -100,7 +102,7 @@
100102
<ui:SettingsCard
101103
Background="Transparent"
102104
BorderThickness="0 0 0 0"
103-
Header="{DynamicResource HotkeyShiftEnterDesc}">
105+
Header="{DynamicResource OpenContextMenuHotkey}">
104106
<StackPanel Orientation="Horizontal">
105107
<cc:HotkeyDisplay Keys="SHIFT+ENTER" Type="Small" />
106108
</StackPanel>
@@ -113,126 +115,108 @@
113115
<ui:SettingsCard
114116
Background="Transparent"
115117
BorderThickness="0 0 0 0"
116-
Header="{DynamicResource HotkeyCtrlEnterDesc}">
118+
Header="{DynamicResource ReloadPluginHotkey}">
119+
<StackPanel Orientation="Horizontal">
120+
<cc:HotkeyDisplay Keys="F5" Type="Small" />
121+
</StackPanel>
122+
</ui:SettingsCard>
123+
<Border
124+
Height="1"
125+
Background="{DynamicResource Color03B}"
126+
BorderThickness="0" />
127+
128+
<ui:SettingsCard
129+
Background="Transparent"
130+
BorderThickness="0 0 0 0"
131+
Header="{DynamicResource HotkeySelectFirstResult}">
132+
<StackPanel Orientation="Horizontal">
133+
<cc:HotkeyDisplay Keys="Alt+Home" Type="Small" />
134+
</StackPanel>
135+
</ui:SettingsCard>
136+
<Border
137+
Height="1"
138+
Background="{DynamicResource Color03B}"
139+
BorderThickness="0" />
140+
141+
<ui:SettingsCard
142+
Background="Transparent"
143+
BorderThickness="0 0 0 0"
144+
Header="{DynamicResource HotkeySelectLastResult}">
145+
<StackPanel Orientation="Horizontal">
146+
<cc:HotkeyDisplay Keys="Alt+End" Type="Small" />
147+
</StackPanel>
148+
</ui:SettingsCard>
149+
<Border
150+
Height="1"
151+
Background="{DynamicResource Color03B}"
152+
BorderThickness="0" />
153+
154+
<ui:SettingsCard
155+
Background="Transparent"
156+
BorderThickness="0 0 0 0"
157+
Header="{DynamicResource HotkeyRequery}">
158+
<StackPanel Orientation="Horizontal">
159+
<cc:HotkeyDisplay Keys="Ctrl+R" Type="Small" />
160+
</StackPanel>
161+
</ui:SettingsCard>
162+
<Border
163+
Height="1"
164+
Background="{DynamicResource Color03B}"
165+
BorderThickness="0" />
166+
167+
<ui:SettingsCard
168+
Background="Transparent"
169+
BorderThickness="0 0 0 0"
170+
Header="{DynamicResource ToggleGameModeHotkey}">
171+
<StackPanel Orientation="Horizontal">
172+
<cc:HotkeyDisplay Keys="Ctrl+F12" Type="Small" />
173+
</StackPanel>
174+
</ui:SettingsCard>
175+
<Border
176+
Height="1"
177+
Background="{DynamicResource Color03B}"
178+
BorderThickness="0" />
179+
180+
<ui:SettingsCard
181+
Background="Transparent"
182+
BorderThickness="0 0 0 0"
183+
Header="{DynamicResource CopyFilePathHotkey}">
117184
<StackPanel Orientation="Horizontal">
118-
<cc:HotkeyDisplay Keys="CTRL+ENTER" Type="Small" />
185+
<cc:HotkeyDisplay Keys="Ctrl+Shift+C" Type="Small" />
119186
</StackPanel>
120187
</ui:SettingsCard>
121188
<Border
122-
BorderBrush="{DynamicResource Color03B}"
123-
BorderThickness="0"
124-
CornerRadius="5">
125-
<StackPanel>
126-
<cc:Card
127-
Title="{DynamicResource HotkeyUpDownDesc}"
128-
BorderThickness="0 0 0 0"
129-
Type="Inside">
130-
<StackPanel Orientation="Horizontal">
131-
<cc:HotkeyDisplay Keys="←+→" Type="Small" />
132-
</StackPanel>
133-
</cc:Card>
134-
<cc:Card
135-
Title="{DynamicResource HotkeyLeftRightDesc}"
136-
BorderThickness="0 0 0 0"
137-
Type="Inside">
138-
<StackPanel Orientation="Horizontal">
139-
<cc:HotkeyDisplay Keys="↑+↓" Type="Small" />
140-
</StackPanel>
141-
</cc:Card>
142-
<cc:Card
143-
Title="{DynamicResource HotkeyESCDesc}"
144-
BorderThickness="0 0 0 0"
145-
Type="Inside">
146-
<StackPanel Orientation="Horizontal">
147-
<cc:HotkeyDisplay Keys="ESC" Type="Small" />
148-
</StackPanel>
149-
</cc:Card>
150-
<cc:Card
151-
Title="{DynamicResource HotkeyRunDesc}"
152-
BorderThickness="0 0 0 0"
153-
Type="Inside">
154-
<cc:HotkeyDisplay Keys="ENTER" Type="Small" />
155-
</cc:Card>
156-
<cc:Card
157-
Title="{DynamicResource OpenContextMenuHotkey}"
158-
BorderThickness="0 0 0 0"
159-
Type="Inside">
160-
<StackPanel Orientation="Horizontal">
161-
<cc:HotkeyDisplay Keys="SHIFT+ENTER" Type="Small" />
162-
</StackPanel>
163-
</cc:Card>
164-
<cc:Card
165-
Title="{DynamicResource ReloadPluginHotkey}"
166-
BorderThickness="0 0 0 0"
167-
Type="Inside">
168-
<StackPanel Orientation="Horizontal">
169-
<cc:HotkeyDisplay Keys="F5" Type="Small" />
170-
</StackPanel>
171-
</cc:Card>
172-
<cc:Card
173-
Title="{DynamicResource HotkeySelectFirstResult}"
174-
BorderThickness="0 0 0 0"
175-
Type="Inside">
176-
<StackPanel Orientation="Horizontal">
177-
<cc:HotkeyDisplay Keys="Alt+Home" Type="Small" />
178-
</StackPanel>
179-
</cc:Card>
180-
<cc:Card
181-
Title="{DynamicResource HotkeySelectLastResult}"
182-
BorderThickness="0 0 0 0"
183-
Type="Inside">
184-
<StackPanel Orientation="Horizontal">
185-
<cc:HotkeyDisplay Keys="Alt+End" Type="Small" />
186-
</StackPanel>
187-
</cc:Card>
188-
<cc:Card
189-
Title="{DynamicResource HotkeyRequery}"
190-
BorderThickness="0 0 0 0"
191-
Type="Inside">
192-
<StackPanel Orientation="Horizontal">
193-
<cc:HotkeyDisplay Keys="Ctrl+R" Type="Small" />
194-
</StackPanel>
195-
</cc:Card>
196-
<cc:Card
197-
Title="{DynamicResource ToggleGameModeHotkey}"
198-
BorderThickness="0 0 0 0"
199-
Type="Inside">
200-
<StackPanel Orientation="Horizontal">
201-
<cc:HotkeyDisplay Keys="Ctrl+F12" Type="Small" />
202-
</StackPanel>
203-
</cc:Card>
204-
<cc:Card
205-
Title="{DynamicResource CopyFilePathHotkey}"
206-
BorderThickness="0 0 0 0"
207-
Type="Inside">
208-
<StackPanel Orientation="Horizontal">
209-
<cc:HotkeyDisplay Keys="Ctrl+Shift+C" Type="Small" />
210-
</StackPanel>
211-
</cc:Card>
212-
<cc:Card
213-
Title="{DynamicResource QuickWidthHotkey}"
214-
BorderThickness="0 0 0 0"
215-
Type="Inside">
216-
<StackPanel Orientation="Horizontal">
217-
<cc:HotkeyDisplay Keys="Ctrl+[" Type="Small" />
218-
<cc:HotkeyDisplay
219-
Margin="4 0 0 0"
220-
Keys="Ctrl+]"
221-
Type="Small" />
222-
</StackPanel>
223-
</cc:Card>
224-
<cc:Card
225-
Title="{DynamicResource QuickHeightHotkey}"
226-
BorderThickness="0 0 0 0"
227-
Type="Inside">
228-
<StackPanel Orientation="Horizontal">
229-
<cc:HotkeyDisplay Keys="Ctrl+Minus" Type="Small" />
230-
<cc:HotkeyDisplay
231-
Margin="4 0 0 0"
232-
Keys="Ctrl+Plus"
233-
Type="Small" />
234-
</StackPanel>
235-
</cc:Card>
189+
Height="1"
190+
Background="{DynamicResource Color03B}"
191+
BorderThickness="0" />
192+
193+
<ui:SettingsCard
194+
Background="Transparent"
195+
BorderThickness="0 0 0 0"
196+
Header="{DynamicResource QuickWidthHotkey}">
197+
<StackPanel Orientation="Horizontal">
198+
<cc:HotkeyDisplay Keys="Ctrl+[" Type="Small" />
199+
<cc:HotkeyDisplay
200+
Margin="4 0 0 0"
201+
Keys="Ctrl+]"
202+
Type="Small" />
203+
</StackPanel>
204+
</ui:SettingsCard>
205+
<Border
206+
Height="1"
207+
Background="{DynamicResource Color03B}"
208+
BorderThickness="0" />
209+
210+
<ui:SettingsCard
211+
Background="Transparent"
212+
BorderThickness="0 0 0 0"
213+
Header="{DynamicResource QuickHeightHotkey}">
214+
<StackPanel Orientation="Horizontal">
215+
<cc:HotkeyDisplay Keys="Ctrl+Minus" Type="Small" />
216+
<cc:HotkeyDisplay
217+
Margin="4 0 0 0"
218+
Keys="Ctrl+Plus"
219+
Type="Small" />
236220
</StackPanel>
237221
</ui:SettingsCard>
238222
</StackPanel>

0 commit comments

Comments
 (0)