Move DisplayedFields to look_feel_tabs.__init__

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')

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

src/calibre/gui2/preferences/look_feel_tabs/__init__.py

@@ -1,41 +1,12 @@
-'''
+#!/usr/bin/env python
-Created on 19 Jan 2025
 
-@author: chaley
-'''
 
-from qt.core import (
+__license__   = 'GPL v3'
-    QAbstractListModel,
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
-    QApplication,
+__docformat__ = 'restructuredtext en'
-    QBrush,
+
-    QColor,
+
-    QColorDialog,
+from qt.core import QAbstractListModel, QIcon, QItemSelectionModel, Qt
-    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,
-)
 
 from calibre.gui2.book_details import get_field_list
 

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):  # {{{