From bca4965dd8e93f76ffcb83ec92116955eee57cd1 Mon Sep 17 00:00:00 2001
From: Guillaume Munch <gm@lyx.org>
Date: Fri, 8 Jul 2016 12:29:26 +0200
Subject: [PATCH] Accessibility of document class combo box (#10035)

* Access it with tab

* Access it with the accelerator from the title of the group

(cherry picked from commit 3e6df9796352dd8574b05934082faff0afe3f44c)
---
 src/frontends/qt4/CategorizedCombo.cpp |  1 -
 src/frontends/qt4/ui/LaTeXUi.ui        | 19 ++++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt4/CategorizedCombo.cpp b/src/frontends/qt4/CategorizedCombo.cpp
index b52172d950..8e4fc64f45 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -348,7 +348,6 @@ CategorizedCombo::CategorizedCombo(QWidget * parent)
 	: QComboBox(parent), d(new Private(this))
 {
 	setSizeAdjustPolicy(QComboBox::AdjustToContents);
-	setFocusPolicy(Qt::ClickFocus);
 	setMinimumWidth(sizeHint().width());
 	setMaxVisibleItems(100);
 
diff --git a/src/frontends/qt4/ui/LaTeXUi.ui b/src/frontends/qt4/ui/LaTeXUi.ui
index 03020634b7..6bac8df1b3 100644
--- a/src/frontends/qt4/ui/LaTeXUi.ui
+++ b/src/frontends/qt4/ui/LaTeXUi.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>LaTeXUi</class>
  <widget class="QWidget" name="LaTeXUi">
@@ -211,7 +212,7 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>CategorizedCombo</class>
+   <class>lyx::frontend::CategorizedCombo</class>
    <extends>QComboBox</extends>
    <header>CategorizedCombo.h</header>
   </customwidget>
@@ -250,5 +251,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>groupBox</sender>
+   <signal>clicked()</signal>
+   <receiver>classCO</receiver>
+   <slot>setFocus()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>160</x>
+     <y>33</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>160</x>
+     <y>47</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
-- 
2.39.5