@@ -189,86 +189,86 @@ public void UpdateProgressFlyout(InteractionOperationType operationType, int amo
189
189
}
190
190
}
191
191
192
- private async void ProHomeInstance_KeyUp ( object sender , KeyRoutedEventArgs e )
192
+ private async void ModernShellPage_KeyUp ( object sender , KeyRoutedEventArgs e )
193
193
{
194
194
var ctrl = Window . Current . CoreWindow . GetKeyState ( VirtualKey . Control ) . HasFlag ( CoreVirtualKeyStates . Down ) ;
195
195
var alt = Window . Current . CoreWindow . GetKeyState ( VirtualKey . Menu ) . HasFlag ( CoreVirtualKeyStates . Down ) ;
196
196
var shift = Window . Current . CoreWindow . GetKeyState ( VirtualKey . Shift ) . HasFlag ( CoreVirtualKeyStates . Down ) ;
197
197
var tabInstance = App . CurrentInstance != null ;
198
198
199
- // switch (c: ctrl, s: shift, a: alt, t: tabInstance, k: e.Key)
200
- // {
201
- // case (true, true, false, true, VirtualKey.N): //ctrl + shift + n, new item
202
- // await App.addItemDialog.ShowAsync();
203
- // break;
204
- // case (false, true, false, true, VirtualKey.Delete): //shift + delete, PermanentDelete
205
- // if (!App.CurrentInstance.NavigationToolbar.IsEditModeEnabled)
206
- // App.InteractionViewModel.PermanentlyDelete = true;
207
- // App.CurrentInstance.InteractionOperations.DeleteItem_Click(null, null);
208
- // break;
209
- // case (true, false, false, true, VirtualKey.C): //ctrl + c, copy
210
- // if (!App.CurrentInstance.NavigationToolbar.IsEditModeEnabled)
211
- // App.CurrentInstance.InteractionOperations.CopyItem_ClickAsync(null, null);
212
- // break;
213
- // case (true, false, false, true, VirtualKey.V): //ctrl + v, paste
214
- // if (!App.CurrentInstance.NavigationToolbar.IsEditModeEnabled)
215
- // App.CurrentInstance.InteractionOperations.PasteItem_ClickAsync(null, null);
216
- // break;
217
- // case (true, false, false, true, VirtualKey.X): //ctrl + x, cut
218
- // if (!App.CurrentInstance.NavigationToolbar.IsEditModeEnabled)
219
- // App.CurrentInstance.InteractionOperations.CutItem_Click(null, null);
220
- // break;
221
- // case (true, false, false, true, VirtualKey.A): //ctrl + a, select all
222
- // if (!App.CurrentInstance.NavigationToolbar.IsEditModeEnabled)
223
- // App.CurrentInstance.InteractionOperations.SelectAllItems();
224
- // break;
225
- // case (true, false, false, true, VirtualKey.N): //ctrl + n, new window
226
- // App.CurrentInstance.InteractionOperations.LaunchNewWindow();
227
- // break;
228
- // case (true, false, false, true, VirtualKey.W): //ctrl + w, close tab
229
- // App.CurrentInstance.InteractionOperations.CloseTab();
230
- // break;
231
- // case (true, false, false, true, VirtualKey.F4): //ctrl + F4, close tab
232
- // App.CurrentInstance.InteractionOperations.CloseTab();
233
- // break;
234
- // case (false, false, false, true, VirtualKey.Delete): //delete, delete item
235
- // if (!App.CurrentInstance.NavigationToolbar.IsEditModeEnabled)
236
- // App.CurrentInstance.InteractionOperations.DeleteItem_Click(null, null);
237
- // break;
238
- // case (false, false, false, true, VirtualKey.Space): //space, quick look
239
- // if (!App.CurrentInstance.NavigationToolbar.IsEditModeEnabled)
240
- // {
241
- // if ((App.CurrentInstance.ContentPage).IsQuickLookEnabled)
242
- // {
243
- // App.CurrentInstance.InteractionOperations.ToggleQuickLook();
244
- // }
245
- // }
246
- // break;
247
- // case (false, false, true, true, VirtualKey.Left): //alt + back arrow, backward
248
- // NavigationActions.Back_Click(null, null);
249
- // break;
250
- // case (false, false, true, true, VirtualKey.Right): //alt + right arrow, forward
251
- // NavigationActions.Forward_Click(null, null);
252
- // break;
253
- // case (true, false, false, true, VirtualKey.R): //ctrl + r, refresh
254
- // NavigationActions.Refresh_Click(null, null);
255
- // break;
256
- // case (true, false, false, true, VirtualKey.F): //ctrl + f, search box
257
- // (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 0;
258
- // break;
259
- // case (true, false, false, true, VirtualKey.E): //ctrl + e, search box
260
- // (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 0;
261
- // break;
262
- // case (false, false, true, true, VirtualKey.H):
263
- // (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 1;
264
- // break;
265
- // case (false, false, true, true, VirtualKey.S):
266
- // (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 2;
267
- // break;
268
- // case (false, false, true, true, VirtualKey.V):
269
- // (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 3;
270
- // break;
271
- // };
199
+ switch ( c : ctrl , s : shift , a : alt , t : tabInstance , k : e . Key )
200
+ {
201
+ case ( true , true , false , true , VirtualKey . N ) : //ctrl + shift + n, new item
202
+ await App . addItemDialog . ShowAsync ( ) ;
203
+ break ;
204
+ case ( false , true , false , true , VirtualKey . Delete ) : //shift + delete, PermanentDelete
205
+ if ( ! App . CurrentInstance . NavigationToolbar . IsEditModeEnabled )
206
+ App . InteractionViewModel . PermanentlyDelete = true ;
207
+ App . CurrentInstance . InteractionOperations . DeleteItem_Click ( null , null ) ;
208
+ break ;
209
+ case ( true , false , false , true , VirtualKey . C ) : //ctrl + c, copy
210
+ if ( ! App . CurrentInstance . NavigationToolbar . IsEditModeEnabled )
211
+ App . CurrentInstance . InteractionOperations . CopyItem_ClickAsync ( null , null ) ;
212
+ break ;
213
+ case ( true , false , false , true , VirtualKey . V ) : //ctrl + v, paste
214
+ if ( ! App . CurrentInstance . NavigationToolbar . IsEditModeEnabled )
215
+ App . CurrentInstance . InteractionOperations . PasteItem_ClickAsync ( null , null ) ;
216
+ break ;
217
+ case ( true , false , false , true , VirtualKey . X ) : //ctrl + x, cut
218
+ if ( ! App . CurrentInstance . NavigationToolbar . IsEditModeEnabled )
219
+ App . CurrentInstance . InteractionOperations . CutItem_Click ( null , null ) ;
220
+ break ;
221
+ case ( true , false , false , true , VirtualKey . A ) : //ctrl + a, select all
222
+ if ( ! App . CurrentInstance . NavigationToolbar . IsEditModeEnabled )
223
+ App . CurrentInstance . InteractionOperations . SelectAllItems ( ) ;
224
+ break ;
225
+ case ( true , false , false , true , VirtualKey . N ) : //ctrl + n, new window
226
+ App . CurrentInstance . InteractionOperations . LaunchNewWindow ( ) ;
227
+ break ;
228
+ case ( true , false , false , true , VirtualKey . W ) : //ctrl + w, close tab
229
+ App . CurrentInstance . InteractionOperations . CloseTab ( ) ;
230
+ break ;
231
+ case ( true , false , false , true , VirtualKey . F4 ) : //ctrl + F4, close tab
232
+ App . CurrentInstance . InteractionOperations . CloseTab ( ) ;
233
+ break ;
234
+ case ( false , false , false , true , VirtualKey . Delete ) : //delete, delete item
235
+ if ( ! App . CurrentInstance . NavigationToolbar . IsEditModeEnabled )
236
+ App . CurrentInstance . InteractionOperations . DeleteItem_Click ( null , null ) ;
237
+ break ;
238
+ case ( false , false , false , true , VirtualKey . Space ) : //space, quick look
239
+ if ( ! App . CurrentInstance . NavigationToolbar . IsEditModeEnabled )
240
+ {
241
+ if ( ( App . CurrentInstance . ContentPage ) . IsQuickLookEnabled )
242
+ {
243
+ App . CurrentInstance . InteractionOperations . ToggleQuickLook ( ) ;
244
+ }
245
+ }
246
+ break ;
247
+ case ( false , false , true , true , VirtualKey . Left ) : //alt + back arrow, backward
248
+ NavigationActions . Back_Click ( null , null ) ;
249
+ break ;
250
+ case ( false , false , true , true , VirtualKey . Right ) : //alt + right arrow, forward
251
+ NavigationActions . Forward_Click ( null , null ) ;
252
+ break ;
253
+ case ( true , false , false , true , VirtualKey . R ) : //ctrl + r, refresh
254
+ NavigationActions . Refresh_Click ( null , null ) ;
255
+ break ;
256
+ case ( true , false , false , true , VirtualKey . F ) : //ctrl + f, search box
257
+ ( App . CurrentInstance . OperationsControl as RibbonArea ) . RibbonTabView . SelectedIndex = 0 ;
258
+ break ;
259
+ case ( true , false , false , true , VirtualKey . E ) : //ctrl + e, search box
260
+ ( App . CurrentInstance . OperationsControl as RibbonArea ) . RibbonTabView . SelectedIndex = 0 ;
261
+ break ;
262
+ case ( false , false , true , true , VirtualKey . H ) :
263
+ ( App . CurrentInstance . OperationsControl as RibbonArea ) . RibbonTabView . SelectedIndex = 1 ;
264
+ break ;
265
+ case ( false , false , true , true , VirtualKey . S ) :
266
+ ( App . CurrentInstance . OperationsControl as RibbonArea ) . RibbonTabView . SelectedIndex = 2 ;
267
+ break ;
268
+ case ( false , false , true , true , VirtualKey . V ) :
269
+ ( App . CurrentInstance . OperationsControl as RibbonArea ) . RibbonTabView . SelectedIndex = 3 ;
270
+ break ;
271
+ } ;
272
272
273
273
274
274
if ( App . CurrentInstance . CurrentPageType == typeof ( PhotoAlbum ) )
0 commit comments