From 9611294dd29b5e8bc24068f47d4561ee1e69e5ea Mon Sep 17 00:00:00 2001
From: Nazar Gerasymchuk <troyan3@gmail.com>
Date: Mon, 1 Aug 2016 18:46:41 +0300
Subject: [PATCH] Core: Fix tab order in several UI forms

For unknown reasons tab order in listed UI files was set incorrectly and
behave unexpectedly. Now tab order behave naturally.

Changes made for next objects:
Core::Internal::ExternalToolConfig (externaltoolconfig.ui),
In QtCreator: Tools -> Options -> Environment -> External Tools tab.

Core::Internal::GeneralSettings (generalsettings.ui),
In QtCreator: Tools -> Options -> Environment -> Interface tab

Core::Internal::MimeTypeMagicDialog (mimetypemagicdialog.ui),
In QtCreator: Tools -> Options -> Environment -> MIME Types tab, choose
any MIME type in "MIME Type" column,

Core::Internal::MimeTypeSettingsPage (mimetypesettingspage.ui), In
QtCreator: Tools -> Options -> Environment -> MIME Types tab

Core::Internal::SystemSettings (systemsettings.ui),
In QtCreator: Tools -> Options -> Environment -> System tab

Change-Id: I04aefcb5ad75ef8b23fa1de324d986b45d5347bd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../coreplugin/dialogs/externaltoolconfig.ui      | 13 +++++++++++++
 src/plugins/coreplugin/generalsettings.ui         |  6 ++++++
 src/plugins/coreplugin/mimetypemagicdialog.ui     |  9 +++++++++
 src/plugins/coreplugin/mimetypesettingspage.ui    | 10 ++++++++++
 src/plugins/coreplugin/systemsettings.ui          | 15 +++++++++++++++
 5 files changed, 53 insertions(+)

diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.ui b/src/plugins/coreplugin/dialogs/externaltoolconfig.ui
index 1c8a76c30e1..36d3247d261 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.ui
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.ui
@@ -288,6 +288,19 @@
    </slots>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>toolTree</tabstop>
+  <tabstop>addButton</tabstop>
+  <tabstop>removeButton</tabstop>
+  <tabstop>revertButton</tabstop>
+  <tabstop>description</tabstop>
+  <tabstop>arguments</tabstop>
+  <tabstop>outputBehavior</tabstop>
+  <tabstop>errorOutputBehavior</tabstop>
+  <tabstop>environmentButton</tabstop>
+  <tabstop>modifiesDocumentCheckbox</tabstop>
+  <tabstop>inputText</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui
index be3adc7c552..333be51ac76 100644
--- a/src/plugins/coreplugin/generalsettings.ui
+++ b/src/plugins/coreplugin/generalsettings.ui
@@ -155,6 +155,12 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>colorButton</tabstop>
+  <tabstop>resetColorButton</tabstop>
+  <tabstop>languageBox</tabstop>
+  <tabstop>resetWarningsButton</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/plugins/coreplugin/mimetypemagicdialog.ui b/src/plugins/coreplugin/mimetypemagicdialog.ui
index bca3dad241b..f638354881b 100644
--- a/src/plugins/coreplugin/mimetypemagicdialog.ui
+++ b/src/plugins/coreplugin/mimetypemagicdialog.ui
@@ -238,6 +238,15 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>valueLineEdit</tabstop>
+  <tabstop>typeSelector</tabstop>
+  <tabstop>maskLineEdit</tabstop>
+  <tabstop>useRecommendedGroupBox</tabstop>
+  <tabstop>startRangeSpinBox</tabstop>
+  <tabstop>endRangeSpinBox</tabstop>
+  <tabstop>prioritySpinBox</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
diff --git a/src/plugins/coreplugin/mimetypesettingspage.ui b/src/plugins/coreplugin/mimetypesettingspage.ui
index 2b4e6fbadc6..ca3a23f8a24 100644
--- a/src/plugins/coreplugin/mimetypesettingspage.ui
+++ b/src/plugins/coreplugin/mimetypesettingspage.ui
@@ -169,6 +169,16 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>filterLineEdit</tabstop>
+  <tabstop>mimeTypesTreeView</tabstop>
+  <tabstop>resetButton</tabstop>
+  <tabstop>patternsLineEdit</tabstop>
+  <tabstop>magicHeadersTreeWidget</tabstop>
+  <tabstop>addMagicButton</tabstop>
+  <tabstop>editMagicButton</tabstop>
+  <tabstop>removeMagicButton</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/plugins/coreplugin/systemsettings.ui b/src/plugins/coreplugin/systemsettings.ui
index f79d829a477..0afda779ea0 100644
--- a/src/plugins/coreplugin/systemsettings.ui
+++ b/src/plugins/coreplugin/systemsettings.ui
@@ -374,6 +374,21 @@
    </slots>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>terminalComboBox</tabstop>
+  <tabstop>resetTerminalButton</tabstop>
+  <tabstop>externalFileBrowserEdit</tabstop>
+  <tabstop>resetFileBrowserButton</tabstop>
+  <tabstop>helpExternalFileBrowserButton</tabstop>
+  <tabstop>fileSystemCaseSensitivityChooser</tabstop>
+  <tabstop>reloadBehavior</tabstop>
+  <tabstop>autoSaveCheckBox</tabstop>
+  <tabstop>autoSaveInterval</tabstop>
+  <tabstop>autoSuspendCheckBox</tabstop>
+  <tabstop>autoSuspendMinDocumentCount</tabstop>
+  <tabstop>warnBeforeOpeningBigFiles</tabstop>
+  <tabstop>bigFilesLimitSpinBox</tabstop>
+ </tabstops>
  <resources>
   <include location="core.qrc"/>
  </resources>