From 4deb5f9ca7d2e0a2d6a982c0391f07bded78c42b Mon Sep 17 00:00:00 2001
From: Hans Loeblich <thehans@gmail.com>
Date: Tue, 1 Dec 2015 18:39:53 -0600
Subject: [PATCH] Support Ctrl-Y Redo in addition to Ctrl-Shift-Z

---
 src/MainWindow.ui       | 9 +++++++++
 src/mainwin.cc          | 1 +
 src/scintillaeditor.cpp | 1 +
 3 files changed, 11 insertions(+)

diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 1ebbe8a5..60016e8a 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -394,6 +394,7 @@
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="Dock" name="editorDock">
+   <addaction name="editActionRedo_2"/>
    <attribute name="dockWidgetArea">
     <number>1</number>
    </attribute>
@@ -642,6 +643,14 @@
     <enum>Qt::WidgetWithChildrenShortcut</enum>
    </property>
   </action>
+  <action name="editActionRedo_2">
+   <property name="shortcut">
+    <string>Ctrl+Y</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
   <action name="editActionCut">
    <property name="text">
     <string>Cu&amp;t</string>
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 7b3fd522..9d17127f 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -337,6 +337,7 @@ MainWindow::MainWindow(const QString &filename)
 	// Edit menu
 	connect(this->editActionUndo, SIGNAL(triggered()), editor, SLOT(undo()));
 	connect(this->editActionRedo, SIGNAL(triggered()), editor, SLOT(redo()));
+	connect(this->editActionRedo_2, SIGNAL(triggered()), editor, SLOT(redo()));
 	connect(this->editActionCut, SIGNAL(triggered()), editor, SLOT(cut()));
 	connect(this->editActionCopy, SIGNAL(triggered()), editor, SLOT(copy()));
 	connect(this->editActionPaste, SIGNAL(triggered()), editor, SLOT(paste()));
diff --git a/src/scintillaeditor.cpp b/src/scintillaeditor.cpp
index bc02ec40..8754a6aa 100644
--- a/src/scintillaeditor.cpp
+++ b/src/scintillaeditor.cpp
@@ -134,6 +134,7 @@ ScintillaEditor::ScintillaEditor(QWidget *parent) : EditorInterface(parent)
 	// Ctrl-Shift-Z should redo on all platforms
 	c = qsci->standardCommands()->find(QsciCommand::Redo);
 	c->setKey(Qt::Key_Z | Qt::CTRL | Qt::SHIFT);
+	c->setAlternateKey(Qt::Key_Y | Qt::CTRL);
 
 	scintillaLayout->setContentsMargins(0, 0, 0, 0);
 	scintillaLayout->addWidget(qsci);