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

Sorry, I forgot the separator.

Browse Source
This commit is contained in:
Charles Haley 2022-10-19 15:00:59 +01:00
parent f20e426efb
commit 0a6d1b4b4a
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/gui2/bars.py
View File

@ -9,7 +9,7 @@ from functools import partial
from qt.core import ( from qt.core import (
Qt, QAction, QMenu, QObject, QToolBar, QToolButton, QSize, pyqtSignal, QKeySequence, QMenuBar, Qt, QAction, QMenu, QObject, QToolBar, QToolButton, QSize, pyqtSignal, QKeySequence, QMenuBar,
QTimer, QPropertyAnimation, QEasingCurve, pyqtProperty, QPainter, QWidget, QPalette, sip, QTimer, QPropertyAnimation, QEasingCurve, pyqtProperty, QPainter, QWidget, QPalette, sip,
QHBoxLayout) QHBoxLayout, QFrame)
from calibre.constants import ismacos from calibre.constants import ismacos
from calibre.gui2 import gprefs, native_menubar_defaults, config from calibre.gui2 import gprefs, native_menubar_defaults, config
@ -679,11 +679,23 @@ class BarsManager(QObject):
for ac in self.search_tool_bar_actions: for ac in self.search_tool_bar_actions:
self.search_tool_bar.removeWidget(ac) self.search_tool_bar.removeWidget(ac)
self.search_tool_bar.setContentsMargins(0, 0, 0, 0)
self.search_tool_bar.setSpacing(0)
self.search_tool_bar_actions = [] self.search_tool_bar_actions = []
for what in gprefs['action-layout-searchbar']: for what in gprefs['action-layout-searchbar']:
if what in self.parent().iactions: if what is None:
frame = QFrame()
frame.setFrameShape(QFrame.Shape.VLine)
frame.setFrameShadow(QFrame.Shadow.Sunken)
frame.setLineWidth(1)
frame.setContentsMargins(0, 5, 0, 5)
self.search_tool_bar.addWidget(frame)
self.search_tool_bar_actions.append(frame)
elif what in self.parent().iactions:
qact = self.parent().iactions[what].qaction qact = self.parent().iactions[what].qaction
tb = QToolButton() tb = QToolButton()
tb.setContentsMargins(0, 0, 0, 0)
tb.setDefaultAction(qact) tb.setDefaultAction(qact)
if not gprefs['search_tool_bar_shows_text']: if not gprefs['search_tool_bar_shows_text']:
tb.setText(None) tb.setText(None)