From 62c518360956b257454cdf931aef8c28ab9c4858 Mon Sep 17 00:00:00 2001
From: kiryl <12550714+kiryl85@users.noreply.github.com>
Date: Tue, 2 Dec 2025 21:36:17 +0100
Subject: [PATCH] set tabulation order for KCC fields (#1178)

* set tabulation order for KCC fields

- loop through fields in more organized order including fields which visibility depends on some checkboxes state

* don't change rc

---------

Co-authored-by: Alex Xu <alexkurosakimh3@gmail.com>
---
 gui/KCC.ui                     | 25 ++++++++++++++------
 kindlecomicconverter/KCC_ui.py | 43 +++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/gui/KCC.ui b/gui/KCC.ui
index f1e727b..cb9fccb 100644
--- a/gui/KCC.ui
+++ b/gui/KCC.ui
@@ -898,36 +898,47 @@
   </widget>
  </widget>
  <tabstops>
-  <tabstop>convertButton</tabstop>
+  <tabstop>jobList</tabstop>
+  <tabstop>fileButton</tabstop>
   <tabstop>clearButton</tabstop>
+  <tabstop>defaultOutputFolderButton</tabstop>
+  <tabstop>defaultOutputFolderBox</tabstop>
   <tabstop>deviceBox</tabstop>
+  <tabstop>widthBox</tabstop>
+  <tabstop>heightBox</tabstop>
   <tabstop>formatBox</tabstop>
+  <tabstop>convertButton</tabstop>
   <tabstop>mangaBox</tabstop>
   <tabstop>rotateBox</tabstop>
   <tabstop>qualityBox</tabstop>
   <tabstop>webtoonBox</tabstop>
   <tabstop>upscaleBox</tabstop>
   <tabstop>gammaBox</tabstop>
+  <tabstop>gammaSlider</tabstop>
   <tabstop>borderBox</tabstop>
   <tabstop>outputSplit</tabstop>
   <tabstop>colorBox</tabstop>
   <tabstop>mozJpegBox</tabstop>
   <tabstop>maximizeStrips</tabstop>
   <tabstop>croppingBox</tabstop>
+  <tabstop>croppingPowerSlider</tabstop>
+  <tabstop>preserveMarginBox</tabstop>
   <tabstop>spreadShiftBox</tabstop>
   <tabstop>deleteBox</tabstop>
   <tabstop>disableProcessingBox</tabstop>
-  <tabstop>chunkSizeBox</tabstop>
+  <tabstop>fileFusionBox</tabstop>
   <tabstop>noRotateBox</tabstop>
   <tabstop>interPanelCropBox</tabstop>
+  <tabstop>metadataTitleBox</tabstop>
+  <tabstop>chunkSizeCheckBox</tabstop>
+  <tabstop>chunkSizeBox</tabstop>
   <tabstop>eraseRainbowBox</tabstop>
-  <tabstop>heightBox</tabstop>
-  <tabstop>croppingPowerSlider</tabstop>
+  <tabstop>rotateFirstBox</tabstop>
+  <tabstop>autoLevelBox</tabstop>
+  <tabstop>autocontrastBox</tabstop>
   <tabstop>editorButton</tabstop>
+  <tabstop>kofiButton</tabstop>
   <tabstop>wikiButton</tabstop>
-  <tabstop>jobList</tabstop>
-  <tabstop>gammaSlider</tabstop>
-  <tabstop>widthBox</tabstop>
  </tabstops>
  <resources>
   <include location="KCC.qrc"/>
diff --git a/kindlecomicconverter/KCC_ui.py b/kindlecomicconverter/KCC_ui.py
index 5e70370..df16860 100644
--- a/kindlecomicconverter/KCC_ui.py
+++ b/kindlecomicconverter/KCC_ui.py
@@ -469,35 +469,46 @@ class Ui_mainWindow(object):
         self.statusBar.setObjectName(u"statusBar")
         self.statusBar.setSizeGripEnabled(False)
         mainWindow.setStatusBar(self.statusBar)
-        QWidget.setTabOrder(self.convertButton, self.clearButton)
-        QWidget.setTabOrder(self.clearButton, self.deviceBox)
-        QWidget.setTabOrder(self.deviceBox, self.formatBox)
-        QWidget.setTabOrder(self.formatBox, self.mangaBox)
+        QWidget.setTabOrder(self.jobList, self.fileButton)
+        QWidget.setTabOrder(self.fileButton, self.clearButton)
+        QWidget.setTabOrder(self.clearButton, self.defaultOutputFolderButton)
+        QWidget.setTabOrder(self.defaultOutputFolderButton, self.defaultOutputFolderBox)
+        QWidget.setTabOrder(self.defaultOutputFolderBox, self.deviceBox)
+        QWidget.setTabOrder(self.deviceBox, self.widthBox)
+        QWidget.setTabOrder(self.widthBox, self.heightBox)
+        QWidget.setTabOrder(self.heightBox, self.formatBox)
+        QWidget.setTabOrder(self.formatBox, self.convertButton)
+        QWidget.setTabOrder(self.convertButton, self.mangaBox)
         QWidget.setTabOrder(self.mangaBox, self.rotateBox)
         QWidget.setTabOrder(self.rotateBox, self.qualityBox)
         QWidget.setTabOrder(self.qualityBox, self.webtoonBox)
         QWidget.setTabOrder(self.webtoonBox, self.upscaleBox)
         QWidget.setTabOrder(self.upscaleBox, self.gammaBox)
-        QWidget.setTabOrder(self.gammaBox, self.borderBox)
+        QWidget.setTabOrder(self.gammaBox, self.gammaSlider)
+        QWidget.setTabOrder(self.gammaSlider, self.borderBox)
         QWidget.setTabOrder(self.borderBox, self.outputSplit)
         QWidget.setTabOrder(self.outputSplit, self.colorBox)
         QWidget.setTabOrder(self.colorBox, self.mozJpegBox)
         QWidget.setTabOrder(self.mozJpegBox, self.maximizeStrips)
         QWidget.setTabOrder(self.maximizeStrips, self.croppingBox)
-        QWidget.setTabOrder(self.croppingBox, self.spreadShiftBox)
+        QWidget.setTabOrder(self.croppingBox, self.croppingPowerSlider)
+        QWidget.setTabOrder(self.croppingPowerSlider, self.preserveMarginBox)
+        QWidget.setTabOrder(self.preserveMarginBox, self.spreadShiftBox)
         QWidget.setTabOrder(self.spreadShiftBox, self.deleteBox)
         QWidget.setTabOrder(self.deleteBox, self.disableProcessingBox)
-        QWidget.setTabOrder(self.disableProcessingBox, self.chunkSizeBox)
-        QWidget.setTabOrder(self.chunkSizeBox, self.noRotateBox)
+        QWidget.setTabOrder(self.disableProcessingBox, self.fileFusionBox)
+        QWidget.setTabOrder(self.fileFusionBox, self.noRotateBox)
         QWidget.setTabOrder(self.noRotateBox, self.interPanelCropBox)
-        QWidget.setTabOrder(self.interPanelCropBox, self.eraseRainbowBox)
-        QWidget.setTabOrder(self.eraseRainbowBox, self.heightBox)
-        QWidget.setTabOrder(self.heightBox, self.croppingPowerSlider)
-        QWidget.setTabOrder(self.croppingPowerSlider, self.editorButton)
-        QWidget.setTabOrder(self.editorButton, self.wikiButton)
-        QWidget.setTabOrder(self.wikiButton, self.jobList)
-        QWidget.setTabOrder(self.jobList, self.gammaSlider)
-        QWidget.setTabOrder(self.gammaSlider, self.widthBox)
+        QWidget.setTabOrder(self.interPanelCropBox, self.metadataTitleBox)
+        QWidget.setTabOrder(self.metadataTitleBox, self.chunkSizeCheckBox)
+        QWidget.setTabOrder(self.chunkSizeCheckBox, self.chunkSizeBox)
+        QWidget.setTabOrder(self.chunkSizeBox, self.eraseRainbowBox)
+        QWidget.setTabOrder(self.eraseRainbowBox, self.rotateFirstBox)
+        QWidget.setTabOrder(self.rotateFirstBox, self.autoLevelBox)
+        QWidget.setTabOrder(self.autoLevelBox, self.autocontrastBox)
+        QWidget.setTabOrder(self.autocontrastBox, self.editorButton)
+        QWidget.setTabOrder(self.editorButton, self.kofiButton)
+        QWidget.setTabOrder(self.kofiButton, self.wikiButton)
 
         self.retranslateUi(mainWindow)