From 534cf8726552ab809f0ee35d483f4e1c5da46b9b Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Sun, 28 May 2017 16:07:02 +0100
Subject: [PATCH 1/3] FIx so NVDA reads 'Categories' rather than 'trreCtrl'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix by Robert Hänggi.
---
 src/prefs/PrefsDialog.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp
index 1db8f4373..3bdcec946 100644
--- a/src/prefs/PrefsDialog.cpp
+++ b/src/prefs/PrefsDialog.cpp
@@ -246,6 +246,8 @@ PrefsDialog::PrefsDialog
       wxASSERT(factories.size() > 0);
       if (!uniquePage) {
          mCategories = safenew wxTreebookExt(this, wxID_ANY, mTitlePrefix);
+         // RJH: Prevent NVDA from reading "treeCtrl"
+         mCategories->GetTreeCtrl()->SetName(_("Category"));
          S.StartHorizontalLay(wxALIGN_LEFT | wxEXPAND, true);
          {
             S.Prop(1);

From ed9744e55678355a5ff15ac142bafe35b76ac27e Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Sun, 28 May 2017 19:49:06 +0100
Subject: [PATCH 2/3] Fewer shortcuts in default shortcut list.

---
 src/prefs/KeyConfigPrefs.cpp | 71 +++++++++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 14 deletions(-)

diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp
index e5db8871e..47c328120 100644
--- a/src/prefs/KeyConfigPrefs.cpp
+++ b/src/prefs/KeyConfigPrefs.cpp
@@ -405,25 +405,68 @@ void KeyConfigPrefs::OnImportDefaults(wxCommandEvent & event)
 {
    int id = event.GetId();
    mNewKeys = mDefaultKeys;
+   wxSortedArrayString MaxListOnly;
+
+   // These short cuts are for the max list only....
+   MaxListOnly.Add( "Ctrl+I" );
+   MaxListOnly.Add( "Ctrl+Alt+I" );
+   MaxListOnly.Add( "Ctrl+J" );
+   MaxListOnly.Add( "Ctrl+Alt+J" );
+   MaxListOnly.Add( "Ctrl+Alt+V" );
+   MaxListOnly.Add( "Alt+X" );
+   MaxListOnly.Add( "Alt+K" );
+   MaxListOnly.Add( "Shift+Alt+X" );
+   MaxListOnly.Add( "Shift+Alt+K" );
+   MaxListOnly.Add( "Alt+L" );
+   MaxListOnly.Add( "Shift+Alt+C" );
+   MaxListOnly.Add( "Alt+I" );
+   MaxListOnly.Add( "Alt+J" );
+   MaxListOnly.Add( "Shift+Alt+J" );
+   MaxListOnly.Add( "Ctrl+Shift+A" );
+   MaxListOnly.Add( "Q" );
+   MaxListOnly.Add( "Shift+J" );
+   MaxListOnly.Add( "Shift+K" );
+   MaxListOnly.Add( "Shift+Home" );
+   MaxListOnly.Add( "Shift+End" );
+   MaxListOnly.Add( "Ctrl+[" );
+   MaxListOnly.Add( "Ctrl+]" );
+   MaxListOnly.Add( "1" );
+   MaxListOnly.Add( "Shift+F5" );
+   MaxListOnly.Add( "Shift+F6" );
+   MaxListOnly.Add( "Shift+F7" );
+   MaxListOnly.Add( "Shift+F8" );
+   MaxListOnly.Add( "Ctrl+Shift+F5" );
+   MaxListOnly.Add( "Ctrl+Shift+F7" );
+   MaxListOnly.Add( "Ctrl+Shift+N" );
+   MaxListOnly.Add( "Ctrl+Shift+M" );
+   MaxListOnly.Add( "Ctrl+Home" );
+   MaxListOnly.Add( "Ctrl+End" );
+   MaxListOnly.Add( "Shift+C" );
+   MaxListOnly.Add( "Alt+Shift+Up" );
+   MaxListOnly.Add( "Alt+Shift+Down" );
+   MaxListOnly.Add( "Shift+P" );
+   MaxListOnly.Add( "Alt+Shift+Left" );
+   MaxListOnly.Add( "Alt+Shift+Right" );
+   MaxListOnly.Add( "Ctrl+Shift+T" );
+   MaxListOnly.Add( "Command+M" );
+   MaxListOnly.Add( "Option+Command+M" );
+   MaxListOnly.Add( "Shift+H" );
+   MaxListOnly.Add( "Shift+O" );
+   MaxListOnly.Add( "Shift+I" );
+   MaxListOnly.Add( "Shift+N" );
+   MaxListOnly.Add( "D" );
+   MaxListOnly.Add( "A" );
+   MaxListOnly.Add( "Alt+Shift+F6" );
+   MaxListOnly.Add( "Alt+F6" );
+
+   MaxListOnly.Sort();
 
    for (size_t i = 0; i < mNewKeys.GetCount(); i++) {
       // Proof of concept for idea for freeing up some unwanted bindings.
       // There will be neater code idioms we can use.
       bool bDeleteBinding = false;
-      if( id == 0 ){
-         bDeleteBinding |= ( mNewKeys[i] == "A" );
-         bDeleteBinding |= ( mNewKeys[i] == "D" );
-         bDeleteBinding |= ( mNewKeys[i] == "Ctrl+Shift+A" );
-         bDeleteBinding |= ( mNewKeys[i] == "Alt+X" );
-         bDeleteBinding |= ( mNewKeys[i] == "Alt+K" );
-         bDeleteBinding |= ( mNewKeys[i] == "Alt+Shift+X" );
-         bDeleteBinding |= ( mNewKeys[i] == "Alt+Shift+K" );
-         bDeleteBinding |= ( mNewKeys[i] == "Alt+L" );
-         bDeleteBinding |= ( mNewKeys[i] == "Alt+Shift+C" );
-         bDeleteBinding |= ( mNewKeys[i] == "Alt+I" );
-         bDeleteBinding |= ( mNewKeys[i] == "Alt+J" );
-         bDeleteBinding |= ( mNewKeys[i] == "Alt+Shift+J" );
-      }
+      if( id == 0 )
+         bDeleteBinding |= ( MaxListOnly.Index( mNewKeys[i] ) != wxNOT_FOUND );
       mManager->SetKeyFromIndex(i, bDeleteBinding ? "" : mNewKeys[i]);
    }
 

From a09fceefb64a47f09dbffc839641ab53900b47a8 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Sun, 28 May 2017 20:28:10 +0100
Subject: [PATCH 3/3] Tweak shortcut list

---
 src/prefs/KeyConfigPrefs.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp
index 47c328120..eb12703d8 100644
--- a/src/prefs/KeyConfigPrefs.cpp
+++ b/src/prefs/KeyConfigPrefs.cpp
@@ -408,7 +408,7 @@ void KeyConfigPrefs::OnImportDefaults(wxCommandEvent & event)
    wxSortedArrayString MaxListOnly;
 
    // These short cuts are for the max list only....
-   MaxListOnly.Add( "Ctrl+I" );
+   //MaxListOnly.Add( "Ctrl+I" );
    MaxListOnly.Add( "Ctrl+Alt+I" );
    MaxListOnly.Add( "Ctrl+J" );
    MaxListOnly.Add( "Ctrl+Alt+J" );
@@ -426,8 +426,8 @@ void KeyConfigPrefs::OnImportDefaults(wxCommandEvent & event)
    MaxListOnly.Add( "Q" );
    MaxListOnly.Add( "Shift+J" );
    MaxListOnly.Add( "Shift+K" );
-   MaxListOnly.Add( "Shift+Home" );
-   MaxListOnly.Add( "Shift+End" );
+   //MaxListOnly.Add( "Shift+Home" );
+   //MaxListOnly.Add( "Shift+End" );
    MaxListOnly.Add( "Ctrl+[" );
    MaxListOnly.Add( "Ctrl+]" );
    MaxListOnly.Add( "1" );