From 9c662216eb3ae494d532f71ef890308b9d01c930 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 20 Jan 2025 11:29:19 +0000
Subject: [PATCH] Move DisplayedFields to look_feel_tabs.__init__

---
 src/calibre/gui2/dialogs/book_info.py         |  2 +-
 src/calibre/gui2/preferences/look_feel.py     |  2 +-
 .../__init__.py}                              | 43 +++----------------
 .../look_feel_tabs/tb_hierarchy.py            |  2 +-
 4 files changed, 10 insertions(+), 39 deletions(-)
 rename src/calibre/gui2/preferences/{look_feel_displayed_fields.py => look_feel_tabs/__init__.py} (87%)

diff --git a/src/calibre/gui2/dialogs/book_info.py b/src/calibre/gui2/dialogs/book_info.py
index 5f982f53c4..f2cee736b3 100644
--- a/src/calibre/gui2/dialogs/book_info.py
+++ b/src/calibre/gui2/dialogs/book_info.py
@@ -88,7 +88,7 @@ class Configure(Dialog):
         Dialog.__init__(self, _('Configure the Book details window'), 'book-details-popup-conf', parent)
 
     def setup_ui(self):
-        from calibre.gui2.preferences.look_feel import DisplayedFields, move_field_down, move_field_up
+        from calibre.gui2.preferences.look_feel_tabs import DisplayedFields, move_field_down, move_field_up
         self.l = QVBoxLayout(self)
         self.field_display_order = fdo = QListView(self)
         self.model = DisplayedFields(self.db, fdo, pref_name='popup_book_display_fields')
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 441b729a2f..c7e327eaa5 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -64,7 +64,7 @@ from calibre.gui2.dialogs.quickview import get_qv_field_list
 from calibre.gui2.library.alternate_views import CM_TO_INCH, auto_height
 from calibre.gui2.preferences import ConfigWidgetBase, Setting, set_help_tips, test_widget
 from calibre.gui2.preferences.coloring import EditRules
-from calibre.gui2.preferences.look_feel_displayed_fields import DisplayedFields, move_field_down, move_field_up
+from calibre.gui2.preferences.look_feel_tabs import DisplayedFields, move_field_down, move_field_up
 from calibre.gui2.preferences.look_feel_ui import Ui_Form
 from calibre.gui2.widgets import BusyCursor
 from calibre.gui2.widgets2 import Dialog
diff --git a/src/calibre/gui2/preferences/look_feel_displayed_fields.py b/src/calibre/gui2/preferences/look_feel_tabs/__init__.py
similarity index 87%
rename from src/calibre/gui2/preferences/look_feel_displayed_fields.py
rename to src/calibre/gui2/preferences/look_feel_tabs/__init__.py
index 90aca97576..c9d1b4f730 100644
--- a/src/calibre/gui2/preferences/look_feel_displayed_fields.py
+++ b/src/calibre/gui2/preferences/look_feel_tabs/__init__.py
@@ -1,41 +1,12 @@
-'''
-Created on 19 Jan 2025
+#!/usr/bin/env python
 
-@author: chaley
-'''
 
-from qt.core import (
-    QAbstractListModel,
-    QApplication,
-    QBrush,
-    QColor,
-    QColorDialog,
-    QComboBox,
-    QDialog,
-    QDialogButtonBox,
-    QFont,
-    QFontDialog,
-    QFontInfo,
-    QFormLayout,
-    QHeaderView,
-    QIcon,
-    QItemSelectionModel,
-    QKeySequence,
-    QLabel,
-    QLineEdit,
-    QListWidgetItem,
-    QPainter,
-    QPixmap,
-    QPushButton,
-    QSize,
-    QSizePolicy,
-    Qt,
-    QTableWidget,
-    QTableWidgetItem,
-    QVBoxLayout,
-    QWidget,
-    pyqtSignal,
-)
+__license__   = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
+from qt.core import QAbstractListModel, QIcon, QItemSelectionModel, Qt
 
 from calibre.gui2.book_details import get_field_list
 
diff --git a/src/calibre/gui2/preferences/look_feel_tabs/tb_hierarchy.py b/src/calibre/gui2/preferences/look_feel_tabs/tb_hierarchy.py
index 4e6ce5715f..aaa49e07f1 100644
--- a/src/calibre/gui2/preferences/look_feel_tabs/tb_hierarchy.py
+++ b/src/calibre/gui2/preferences/look_feel_tabs/tb_hierarchy.py
@@ -12,7 +12,7 @@ from qt.core import QListWidgetItem, Qt
 
 from calibre.gui2 import choose_files, choose_save_file, error_dialog, gprefs
 from calibre.gui2.preferences import ConfigTabWidget
-from calibre.gui2.preferences.look_feel_displayed_fields import DisplayedFields
+from calibre.gui2.preferences.look_feel_tabs import DisplayedFields
 from calibre.gui2.preferences.look_feel_tabs.tb_hierarchy_ui import Ui_Form
 
 class TBHierarchicalFields(DisplayedFields):  # {{{