From 332b488cc437b31d542756c3a81d22bf463668a3 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Mon, 11 May 2015 07:05:28 +0200
Subject: [PATCH] More shortcuts for #110.

---
 resources/text/CHANGELOG  |  2 +-
 src/gui/toolbareditor.cpp | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 40efd9c6d..64e2c93d3 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -9,7 +9,7 @@ Fixed:
 <ul>
 <li>Target directory settings is now used for all kinds of downloading + when prompt for each download destination is set, then previously used folder is saved. (issue #108)</li>
 <li>Fixed solarized skin. (issue #111)</li>
-<li>Keyboard shorcuts and toolbar editors now have alphabetically sorted actions. Toolbar editor switched from drag/drop to buttons. (issue 
+<li>Keyboard shorcuts and toolbar editors now have alphabetically sorted actions. Toolbar editor switched from drag/drop to buttons. You can use CTRL+UP/DOWN arrow to move buttons in toolbar editor or double-click them to add/remove them. (issue 
 #110)</li>
 <li>New constructs on source code level.</li>
 <li>Many minor fixes, mainly code cleanup and refactoring.</li>
diff --git a/src/gui/toolbareditor.cpp b/src/gui/toolbareditor.cpp
index 62b2e6f0c..edea1851e 100755
--- a/src/gui/toolbareditor.cpp
+++ b/src/gui/toolbareditor.cpp
@@ -113,12 +113,22 @@ void ToolBarEditor::saveToolBar() {
 }
 
 bool ToolBarEditor::eventFilter(QObject *object, QEvent *event) {
-  if (event->type() == QEvent::KeyPress) {
-    QKeyEvent *key_event = static_cast<QKeyEvent*>(event);
+  if (object == m_ui->m_listActivatedActions) {
+    if (event->type() == QEvent::KeyPress) {
+      QKeyEvent *key_event = static_cast<QKeyEvent*>(event);
 
-    if (key_event->key() == Qt::Key_Delete) {
-      deleteSelectedAction();
-      return true;
+      if (key_event->key() == Qt::Key_Delete) {
+        deleteSelectedAction();
+        return true;
+      }
+      else if (key_event->key() == Qt::Key_Down && key_event->modifiers() & Qt::ControlModifier) {
+        moveActionDown();
+        return true;
+      }
+      else if (key_event->key() == Qt::Key_Up && key_event->modifiers() & Qt::ControlModifier) {
+        moveActionUp();
+        return true;
+      }
     }
   }