From 0c389a57bafcd4a4b90fca6ecf05577d22da8ed4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 9 Dec 2020 08:08:09 +0530 Subject: [PATCH] Fix QListView::Flow --- src/calibre/gui2/library/alternate_views.py | 2 +- src/calibre/gui2/metadata/config.py | 2 +- src/calibre/gui2/metadata/single_download.py | 2 +- src/calibre/gui2/preferences/conversion.py | 2 +- src/calibre/gui2/preferences/texture_chooser.py | 4 ++-- src/calibre/gui2/tweak_book/char_select.py | 2 +- src/calibre/gui2/tweak_book/editor/insert_resource.py | 2 +- src/calibre/gui2/tweak_book/editor/snippets.py | 4 ++-- src/calibre/gui2/tweak_book/preferences.py | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py index 0f45097357..08a2bd703c 100644 --- a/src/calibre/gui2/library/alternate_views.py +++ b/src/calibre/gui2/library/alternate_views.py @@ -699,7 +699,7 @@ class GridView(QListView): setup_dnd_interface(self) self.setUniformItemSizes(True) self.setWrapping(True) - self.setFlow(Qt.LayoutDirection.LeftToRight) + self.setFlow(QListView.Flow.LeftToRight) # We cannot set layout mode to batched, because that breaks # restore_vpos() # self.setLayoutMode(self.Batched) diff --git a/src/calibre/gui2/metadata/config.py b/src/calibre/gui2/metadata/config.py index 16b7528d05..be3ba8e9ee 100644 --- a/src/calibre/gui2/metadata/config.py +++ b/src/calibre/gui2/metadata/config.py @@ -80,7 +80,7 @@ class ConfigWidget(QWidget): g.setContentsMargins(0, 0, 0, 0) self.fields_view = v = FieldsList(self) g.addWidget(v) - v.setFlow(Qt.LayoutDirection.LeftToRight) + v.setFlow(QListView.Flow.LeftToRight) v.setWrapping(True) v.setResizeMode(v.Adjust) self.fields_model = FieldsModel(self.plugin) diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py index 56af7543ab..61bb85dcf6 100644 --- a/src/calibre/gui2/metadata/single_download.py +++ b/src/calibre/gui2/metadata/single_download.py @@ -769,7 +769,7 @@ class CoversView(QListView): # {{{ self.m = CoversModel(current_cover, self) self.setModel(self.m) - self.setFlow(Qt.LayoutDirection.LeftToRight) + self.setFlow(QListView.Flow.LeftToRight) self.setWrapping(True) self.setResizeMode(self.Adjust) self.setGridSize(QSize(190, 260)) diff --git a/src/calibre/gui2/preferences/conversion.py b/src/calibre/gui2/preferences/conversion.py index b487dd77a7..26323622a4 100644 --- a/src/calibre/gui2/preferences/conversion.py +++ b/src/calibre/gui2/preferences/conversion.py @@ -52,7 +52,7 @@ class ListView(QListView): f.setBold(True) self.setFont(f) self.setIconSize(QSize(48, 48)) - self.setFlow(self.TopToBottom) + self.setFlow(QListView.Flow.TopToBottom) self.setSpacing(10) def currentChanged(self, cur, prev): diff --git a/src/calibre/gui2/preferences/texture_chooser.py b/src/calibre/gui2/preferences/texture_chooser.py index d24d0d8e50..34391c5148 100644 --- a/src/calibre/gui2/preferences/texture_chooser.py +++ b/src/calibre/gui2/preferences/texture_chooser.py @@ -9,7 +9,7 @@ import glob, os, shutil from functools import partial from PyQt5.Qt import ( QDialog, QVBoxLayout, QListWidget, QListWidgetItem, Qt, QIcon, - QApplication, QSize, QDialogButtonBox, QTimer, QLabel, QAbstractItemView) + QApplication, QSize, QDialogButtonBox, QTimer, QLabel, QAbstractItemView, QListView) from calibre.constants import config_dir from calibre.gui2 import choose_files, error_dialog @@ -47,7 +47,7 @@ class TextureChooser(QDialog): il.itemDoubleClicked.connect(self.accept, type=Qt.ConnectionType.QueuedConnection) il.setIconSize(QSize(256, 256)) il.setViewMode(il.IconMode) - il.setFlow(Qt.LayoutDirection.LeftToRight) + il.setFlow(QListView.Flow.LeftToRight) il.setSpacing(20) il.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) il.itemSelectionChanged.connect(self.update_remove_state) diff --git a/src/calibre/gui2/tweak_book/char_select.py b/src/calibre/gui2/tweak_book/char_select.py index 415deda217..73395b84c7 100644 --- a/src/calibre/gui2/tweak_book/char_select.py +++ b/src/calibre/gui2/tweak_book/char_select.py @@ -591,7 +591,7 @@ class CharView(QListView): self.delegate = CharDelegate(self) self.setResizeMode(self.Adjust) self.setItemDelegate(self.delegate) - self.setFlow(Qt.LayoutDirection.LeftToRight) + self.setFlow(QListView.Flow.LeftToRight) self.setWrapping(True) self.setMouseTracking(True) self.setSpacing(2) diff --git a/src/calibre/gui2/tweak_book/editor/insert_resource.py b/src/calibre/gui2/tweak_book/editor/insert_resource.py index 814a1a1972..e241f0b8db 100644 --- a/src/calibre/gui2/tweak_book/editor/insert_resource.py +++ b/src/calibre/gui2/tweak_book/editor/insert_resource.py @@ -215,7 +215,7 @@ class InsertImage(Dialog): self.view = v = QListView(self) v.setViewMode(v.IconMode) - v.setFlow(Qt.LayoutDirection.LeftToRight) + v.setFlow(QListView.Flow.LeftToRight) v.setSpacing(4) v.setResizeMode(v.Adjust) v.setUniformItemSizes(True) diff --git a/src/calibre/gui2/tweak_book/editor/snippets.py b/src/calibre/gui2/tweak_book/editor/snippets.py index 69cb2a3fbe..a8c52587b7 100644 --- a/src/calibre/gui2/tweak_book/editor/snippets.py +++ b/src/calibre/gui2/tweak_book/editor/snippets.py @@ -11,7 +11,7 @@ from itertools import groupby from operator import attrgetter, itemgetter from PyQt5.Qt import ( - Qt, QObject, QSize, QVBoxLayout, QStackedLayout, QWidget, QLineEdit, + Qt, QObject, QSize, QVBoxLayout, QStackedLayout, QWidget, QLineEdit, QListView, QToolButton, QIcon, QHBoxLayout, QPushButton, QListWidget, QListWidgetItem, QGridLayout, QPlainTextEdit, QLabel, QFrame, QDialog, QDialogButtonBox) @@ -486,7 +486,7 @@ class EditSnippet(QWidget): add_row(_('&Template:'), t) self.types = t = QListWidget(self) - t.setFlow(Qt.LayoutDirection.LeftToRight) + t.setFlow(QListView.Flow.LeftToRight) t.setWrapping(True), t.setResizeMode(t.Adjust), t.setSpacing(5) fm = t.fontMetrics() t.setMaximumHeight(2*(fm.ascent() + fm.descent()) + 25) diff --git a/src/calibre/gui2/tweak_book/preferences.py b/src/calibre/gui2/tweak_book/preferences.py index 55e993a7e0..8e8c33f98a 100644 --- a/src/calibre/gui2/tweak_book/preferences.py +++ b/src/calibre/gui2/tweak_book/preferences.py @@ -16,7 +16,7 @@ from copy import copy, deepcopy from PyQt5.Qt import ( QDialog, QGridLayout, QStackedWidget, QDialogButtonBox, QListWidget, - QListWidgetItem, QIcon, QWidget, QSize, QFormLayout, Qt, QSpinBox, + QListWidgetItem, QIcon, QWidget, QSize, QFormLayout, Qt, QSpinBox, QListView, QCheckBox, pyqtSignal, QDoubleSpinBox, QComboBox, QLabel, QFont, QApplication, QFontComboBox, QPushButton, QSizePolicy, QHBoxLayout, QGroupBox, QAbstractItemView, QToolButton, QVBoxLayout, QSpacerItem, QTimer, QRadioButton) @@ -733,7 +733,7 @@ class Preferences(QDialog): cl.currentRowChanged.connect(self.stacks.setCurrentIndex) cl.clearPropertyFlags() cl.setViewMode(cl.IconMode) - cl.setFlow(cl.TopToBottom) + cl.setFlow(QListView.Flow.TopToBottom) cl.setMovement(cl.Static) cl.setWrapping(False) cl.setSpacing(15)