diff options
| -rw-r--r-- | UMain.pas | 68 |
1 files changed, 33 insertions, 35 deletions
@@ -1275,7 +1275,6 @@ procedure TFMain.ListViewKeyDown(Sender: TObject; Key: Word; Shift: TShiftState; var AListView: TGTKListView; ANotebook: TEphyNotebook; LeftPanel: boolean; - vadj, hadj: PGtkAdjustment; x: integer; begin if not Assigned(Sender) or not (Sender is TGTKListView) then DebugMsg(['**** ListViewKeyDown: Sender is not TGTKListView or not valid']); @@ -1283,16 +1282,10 @@ begin if LeftListView.Focused then LeftPanel := True else if RightListView.Focused then LeftPanel := False else LeftPanel := LeftLastFocused; - if LeftPanel then begin - ANotebook := LeftPanelNotebook; - vadj := gtk_scrolled_window_get_vadjustment(PGtkScrolledWindow(LeftScrolledWindow.FWidget)); - hadj := gtk_scrolled_window_get_hadjustment(PGtkScrolledWindow(LeftScrolledWindow.FWidget)); - end else begin - ANotebook := RightPanelNotebook; - vadj := gtk_scrolled_window_get_vadjustment(PGtkScrolledWindow(RightScrolledWindow.FWidget)); - hadj := gtk_scrolled_window_get_hadjustment(PGtkScrolledWindow(RightScrolledWindow.FWidget)); - end; + if LeftPanel then ANotebook := LeftPanelNotebook + else ANotebook := RightPanelNotebook; FileListTipsHide; + case Key of GDK_TAB, 65056 : if (ssCtrl in Shift) and ANotebook.Visible then begin Accept := False; @@ -1307,7 +1300,7 @@ begin if LeftPanel then RightListView.SetFocus else LeftListView.SetFocus; end; - GDK_RETURN, GDK_KP_ENTER : if (Key = GDK_RETURN) and (Shift = [ssAlt, ssShift]) then DoGetDirSize(True) else + GDK_RETURN, GDK_KP_ENTER : if {(Key = GDK_RETURN) and} (Shift = [ssAlt, ssShift]) then DoGetDirSize(True) else if ([ssAlt] = Shift) or ([ssCtrl] = Shift) then begin CommandLineComboKeyDown(Sender, Key, Shift, Accept); Accept := False; @@ -1399,30 +1392,6 @@ begin DeactivateQuickFind(LeftPanel); if RunningEscSensitive > 0 then FMainEscPressed := True; end; - GDK_S, GDK_Capital_S : if (ssAlt in Shift) or (ssCtrl in Shift) - then ActivateQuickFind(Sender = LeftListView) - else begin - Accept := False; - if QuickFind then QuickFindSendKey(LeftPanel, Key) - else ActivateCommandLine(Key); - end; - GDK_O, GDK_Capital_O : if ssAlt in Shift then SwitchOtherPanel(LeftPanel, False) - else begin - Accept := False; - if QuickFind then QuickFindSendKey(LeftPanel, Key) - else ActivateCommandLine(Key); - end; - GDK_P, GDK_Capital_P, GDK_N, GDK_Capital_N: - if ((Shift = [ssAlt]) or (Shift = [ssCtrl]) or ((Shift = []) and (not QuickFind))) { and (CommandLineHistory.Count > 0) } - then CommandLineComboKeyDown(Sender, Key, Shift, Accept) - else if QuickFind then QuickFindSendKey(LeftPanel, Key); - GDK_A, GDK_Capital_A: if (Shift = [ssAlt]) or (Shift = [ssCtrl]) or ((Shift = []) and (not QuickFind)) - then CommandLineComboKeyDown(Sender, Key, Shift, Accept) - else if QuickFind then QuickFindSendKey(LeftPanel, Key); - GDK_D, GDK_Capital_D: if Shift = [ssCtrl] then begin - ShowBookmarkQuick(LeftPanel); - Accept := False; - end; GDK_WIN_POPUP : begin Accept := False; PopupFileMenuPos; @@ -1468,6 +1437,35 @@ begin then Accept := False; end; + + GDK_A, GDK_Capital_A: if (Shift = [ssAlt]) or (Shift = [ssCtrl]) or ((Shift = []) and (not QuickFind)) + then CommandLineComboKeyDown(Sender, Key, Shift, Accept) + else if QuickFind then QuickFindSendKey(LeftPanel, Key); + GDK_D, GDK_Capital_D: if Shift = [ssCtrl] then begin + Accept := False; + ShowBookmarkQuick(LeftPanel); + end else begin + Accept := False; + if QuickFind then QuickFindSendKey(LeftPanel, Key) + else ActivateCommandLine(Key); + end; + GDK_O, GDK_Capital_O : if (Shift = [ssAlt]) then SwitchOtherPanel(LeftPanel, False) + else begin + Accept := False; + if QuickFind then QuickFindSendKey(LeftPanel, Key) + else ActivateCommandLine(Key); + end; + GDK_P, GDK_Capital_P, GDK_N, GDK_Capital_N: + if ((Shift = [ssAlt]) or (Shift = [ssCtrl]) or ((Shift = []) and (not QuickFind))) { and (CommandLineHistory.Count > 0) } + then CommandLineComboKeyDown(Sender, Key, Shift, Accept) + else if QuickFind then QuickFindSendKey(LeftPanel, Key); + GDK_S, GDK_Capital_S : if (Shift = [ssAlt]) or (Shift = [ssCtrl]) + then ActivateQuickFind(Sender = LeftListView) + else begin + Accept := False; + if QuickFind then QuickFindSendKey(LeftPanel, Key) + else ActivateCommandLine(Key); + end; else if QuickFind then Accept := not QuickFindSendKey(LeftPanel, Key) else Accept := not ActivateCommandLine(Key); end; |