Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source 
Fixes #1959928 [All-In-One Edit Metadata Screen File Area Adjustment](https://bugs.launchpad.net/calibre/+bug/1959928)
This commit is contained in:
Kovid Goyal 2022-02-04 16:06:02 +05:30
commit 0b38930e94
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/calibre/gui2/metadata/single.py
View File

@ -13,7 +13,7 @@ from qt.core import (
QApplication, QDialog, QDialogButtonBox, QFrame, QGridLayout, QGroupBox, QApplication, QDialog, QDialogButtonBox, QFrame, QGridLayout, QGroupBox,
QHBoxLayout, QIcon, QInputDialog, QKeySequence, QMenu, QPushButton, QScrollArea, QHBoxLayout, QIcon, QInputDialog, QKeySequence, QMenu, QPushButton, QScrollArea,
QShortcut, QSize, QSizePolicy, QSpacerItem, QSplitter, Qt, QTabWidget, QShortcut, QSize, QSizePolicy, QSpacerItem, QSplitter, Qt, QTabWidget,
QToolButton, QVBoxLayout, QWidget, pyqtSignal QToolButton, QVBoxLayout, QWidget, pyqtSignal, QPalette
) )
from calibre.constants import ismacos from calibre.constants import ismacos
@ -743,6 +743,13 @@ class Splitter(QSplitter):
return QSplitter.resizeEvent(self, ev) return QSplitter.resizeEvent(self, ev)
def color_splitter_handle(splitter):
# Slightly color the splitter handle. The Base color role takes light and
# dark mode into effect.
c = splitter.palette().color(QPalette.ColorRole.Base)
splitter.setStyleSheet("QSplitter::Handle { background: %s }"%c.name())
class MetadataSingleDialog(MetadataSingleDialogBase): # {{{ class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
def do_layout(self): def do_layout(self):
@ -799,6 +806,7 @@ class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
tl.addWidget(self.formats_manager, 0, 6, 3, 1) tl.addWidget(self.formats_manager, 0, 6, 3, 1)
self.splitter = Splitter(Qt.Orientation.Horizontal, self) self.splitter = Splitter(Qt.Orientation.Horizontal, self)
color_splitter_handle(self.splitter)
self.splitter.addWidget(self.cover) self.splitter.addWidget(self.cover)
self.splitter.frame_resized.connect(self.cover.frame_resized) self.splitter.frame_resized.connect(self.cover.frame_resized)
l.addWidget(self.splitter) l.addWidget(self.splitter)
@ -1039,6 +1047,7 @@ class MetadataSingleDialogAlt1(MetadataSingleDialogBase): # {{{
wgl.addWidget(self.formats_manager) wgl.addWidget(self.formats_manager)
self.splitter = QSplitter(Qt.Orientation.Horizontal, tab1) self.splitter = QSplitter(Qt.Orientation.Horizontal, tab1)
color_splitter_handle(self.splitter)
tab1.l.addWidget(self.splitter) tab1.l.addWidget(self.splitter)
self.splitter.addWidget(self.cover) self.splitter.addWidget(self.cover)
self.splitter.addWidget(wsp) self.splitter.addWidget(wsp)
@ -1203,23 +1212,24 @@ class MetadataSingleDialogAlt2(MetadataSingleDialogBase): # {{{
hl.addWidget(b) hl.addWidget(b)
cover_layout.addLayout(hl) cover_layout.addLayout(hl)
sto(self.cover.buttons[-2], self.cover.buttons[-1]) sto(self.cover.buttons[-2], self.cover.buttons[-1])
# Layout for both cover & formats boxes # Splitter for both cover & formats boxes
cover_and_formats = QVBoxLayout() self.cover_and_formats = cover_and_formats = QSplitter(Qt.Orientation.Vertical)
cover_and_formats.setContentsMargins(0, 0, 0, 0) # Put a very small margin on the left so that the word "Cover" doesn't
cover_and_formats.addWidget(cover_group_box, stretch=100) # touch the splitter
cover_and_formats.setContentsMargins(1, 0, 0, 0)
cover_and_formats.addWidget(cover_group_box)
# Add the formats manager box # Add the formats manager box
cover_and_formats.addWidget(self.formats_manager) cover_and_formats.addWidget(self.formats_manager)
sto(self.cover.buttons[-1], self.formats_manager) sto(self.cover.buttons[-1], self.formats_manager)
self.formats_manager.formats.setMaximumWidth(10000) self.formats_manager.formats.setMaximumWidth(10000)
self.formats_manager.formats.setIconSize(QSize(32, 32)) self.formats_manager.formats.setIconSize(QSize(32, 32))
main_splitter.addWidget(cover_and_formats)
cover_and_formats_widget = QWidget() color_splitter_handle(main_splitter)
main_splitter.addWidget(cover_and_formats_widget)
cover_and_formats_widget.setLayout(cover_and_formats)
def save_widget_settings(self): def save_widget_settings(self):
gprefs['all_on_one_metadata_splitter_1_state'] = bytearray(self.metadata_splitter.saveState()) gprefs['all_on_one_metadata_splitter_1_state'] = bytearray(self.metadata_splitter.saveState())
gprefs['all_on_one_metadata_splitter_2_state'] = bytearray(self.main_splitter.saveState()) gprefs['all_on_one_metadata_splitter_2_state'] = bytearray(self.main_splitter.saveState())
gprefs['all_on_one_metadata_splitter_3_state'] = bytearray(self.cover_and_formats.saveState())
def restore_widget_settings(self): def restore_widget_settings(self):
s = gprefs.get('all_on_one_metadata_splitter_1_state') s = gprefs.get('all_on_one_metadata_splitter_1_state')
@ -1228,6 +1238,9 @@ class MetadataSingleDialogAlt2(MetadataSingleDialogBase): # {{{
s = gprefs.get('all_on_one_metadata_splitter_2_state') s = gprefs.get('all_on_one_metadata_splitter_2_state')
if s is not None: if s is not None:
self.main_splitter.restoreState(s) self.main_splitter.restoreState(s)
s = gprefs.get('all_on_one_metadata_splitter_3_state')
if s is not None:
self.cover_and_formats.restoreState(s)
# }}} # }}}