Index: doc/keyboard-commands.docbook
===================================================================
--- doc/keyboard-commands.docbook
+++ doc/keyboard-commands.docbook
@@ -944,46 +944,6 @@
-
-
-
- &Ctrl;
- &Down;
-
-
-
-
- Go from the active panel to
- the command line/terminal emulator.
-
-
-
-
-
-
- &Ctrl;
- &Up;
-
-
-
-
- Go from the command
- line/terminal emulator to the active panel.
-
-
-
-
-
-
- &Ctrl;
- &Up;
-
-
-
- Go from the active panel to the
- Location Toolbar.
-
-
@@ -1203,31 +1163,41 @@
-
- &Ctrl;&Shift;
+ &Ctrl;&Shift;
+ &Down;
+
+
+
+
+ Go from the active panel to
+ the command line/terminal emulator.
+
+
+
+
+
+
+ &Ctrl;&Shift;
&Up;
- Open
- terminal emulator,
- independently, whether the command line is shown or
- not.
+
+ Go from the command
+ line/terminal emulator to the active panel.
+
-
- &Ctrl;&Shift;
- &Down;
+ &Ctrl;&Shift;
+ &Up;
- Close
- terminal emulator,
- independently, whether the command line is shown or
- not.
+ Go from the active panel to the
+ Location Toolbar.
@@ -1652,37 +1622,37 @@
- &Ctrl;
- &Up;
+
+ &Ctrl;&Enter;
- Jump from the command line to the active
- panel.
+ Insert current file / directory name without
+ path to current command line position.
- &Ctrl;
- &Down;
+ &Ctrl;&Shift;
+ &Up;
- Jump from the active panel to the command
- line.
+ Jump from the command line to the active
+ panel.
-
- &Ctrl;&Enter;
+ &Ctrl;&Shift;
+ &Down;
- Insert current file / directory name without
- path to current command line position.
+ Jump from the active panel to the command
+ line.
@@ -1732,30 +1702,6 @@
Insert from clipboard.
-
-
-
- &Ctrl;
- &Up;
-
-
-
- Jump from the Terminal Emulator to the active
- panel if the Command line is hidden.
-
-
-
-
-
- &Ctrl;
- &Down;
-
-
-
- Jump from the active panel to the Terminal Emulator
- if the Command line is hidden.
-
-
Index: doc/user-interface.docbook
===================================================================
--- doc/user-interface.docbook
+++ doc/user-interface.docbook
@@ -659,8 +659,8 @@
be used when configured or
&Ctrl; &Shift;F toggles
between normal and full screen mode. If the command line is hidden,
- press &Ctrl; Arrow down
- to focus the terminal emulator. &Ctrl;
+ press &Ctrl; &Shift;Arrow down
+ to focus the terminal emulator. &Ctrl; &Shift;
Arrow up brings you back down.
&Ctrl;&Enter; and
&Ctrl; &Shift; &Enter; paste the filename.
Index: krusader/GUI/kcmdline.cpp
===================================================================
--- krusader/GUI/kcmdline.cpp
+++ krusader/GUI/kcmdline.cpp
@@ -129,20 +129,6 @@
}
KHistoryComboBox::keyPressEvent(e);
break;
- case Qt::Key_Down:
- if (e->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)) {
- MAIN_VIEW->focusTerminalEmulator();
- return;
- } else
- KHistoryComboBox::keyPressEvent(e);
- break;
- case Qt::Key_Up:
- if (e->modifiers() == Qt::ControlModifier || e->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)) {
- emit returnToPanel();
- return;
- } else
- KHistoryComboBox::keyPressEvent(e);
- break;
case Qt::Key_Escape:
if (e->modifiers() == 0) {
emit returnToPanel();
Index: krusader/GUI/terminaldock.cpp
===================================================================
--- krusader/GUI/terminaldock.cpp
+++ krusader/GUI/terminaldock.cpp
@@ -194,19 +194,6 @@
return true;
}
- //navigation
- if ((ke->key() == Qt::Key_Down) && (ke->modifiers() == Qt::ControlModifier)) {
- if (MAIN_VIEW->cmdLine()->isVisible()) {
- MAIN_VIEW->cmdLine()->setFocus();
- }
- return true;
- } else if ((ke->key() == Qt::Key_Up)
- && ((ke->modifiers() == Qt::ControlModifier)
- || (ke->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)))) {
- ACTIVE_PANEL->gui->slotFocusOnMe();
- return true;
- }
-
return false;
}
Index: krusader/Panel/PanelView/krview.cpp
===================================================================
--- krusader/Panel/PanelView/krview.cpp
+++ krusader/Panel/PanelView/krview.cpp
@@ -715,10 +715,7 @@
}
return true;
case Qt::Key_Up :
- if (e->modifiers() == Qt::ControlModifier) {
- // let the panel handle it - jump to the Location Bar
- e->ignore();
- } else {
+ {
KrViewItem *item = getCurrentKrViewItem();
if (item) {
if (e->modifiers() == Qt::ShiftModifier) {
@@ -734,10 +731,7 @@
}
return true;
case Qt::Key_Down :
- if (e->modifiers() == Qt::ControlModifier || e->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)) {
- // let the panel handle it - jump to command line
- e->ignore();
- } else {
+ {
KrViewItem *item = getCurrentKrViewItem();
if (item) {
if (e->modifiers() == Qt::ShiftModifier) {
Index: krusader/Panel/listpanel.cpp
===================================================================
--- krusader/Panel/listpanel.cpp
+++ krusader/Panel/listpanel.cpp
@@ -537,10 +537,7 @@
}
} else if(e->type() == QEvent::KeyPress) {
auto *ke = dynamic_cast(e);
- if ((ke->key() == Qt::Key_Down) && (ke->modifiers() == Qt::ControlModifier)) {
- slotFocusOnMe();
- return true;
- } else if ((ke->key() == Qt::Key_Escape) && (ke->modifiers() == Qt::NoModifier)) {
+ if ((ke->key() == Qt::Key_Escape) && (ke->modifiers() == Qt::NoModifier)) {
// reset navigator
urlNavigator->editor()->setUrl(urlNavigator->locationUrl());
slotFocusOnMe();
@@ -949,26 +946,6 @@
} else
e->ignore();
break;
- case Qt::Key_Down :
- if (e->modifiers() == Qt::ControlModifier) { // give the keyboard focus to the command line
- if (MAIN_VIEW->cmdLine()->isVisible())
- MAIN_VIEW->cmdLineFocus();
- else
- MAIN_VIEW->focusTerminalEmulator();
- return;
- } else if (e->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)) { // give the keyboard focus to TE
- MAIN_VIEW->focusTerminalEmulator();
- } else
- e->ignore();
- break;
-
- case Qt::Key_Up :
- if (e->modifiers() == Qt::ControlModifier) { // give the keyboard focus to the url navigator
- editLocation();
- return;
- } else
- e->ignore();
- break;
case Qt::Key_Escape:
cancelProgress();
@@ -1283,8 +1260,7 @@
void ListPanel::getFocusCandidates(QVector &widgets)
{
- if(urlNavigator->editor()->isVisible())
- widgets << urlNavigator->editor();
+ widgets << urlNavigator->editor();
if(view->widget()->isVisible())
widgets << view->widget();
if(sidebar && sidebar->isVisible())
Index: krusader/krusaderview.cpp
===================================================================
--- krusader/krusaderview.cpp
+++ krusader/krusaderview.cpp
@@ -255,6 +255,8 @@
if(currentFocus >= 0 && currentFocus < widgets.count())
widgets[currentFocus]->setFocus();
+ if(currentFocus == 0)
+ activePanel()->gui->editLocation();
}
void KrusaderView::focusDown()