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

Better handling of image alignment change on right click

Browse Source
This commit is contained in:
Kovid Goyal 2023-09-06 11:41:45 +05:30
parent 9240af7d40
commit 705c174271
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/calibre/gui2/comments_editor.py
View File

@ -16,7 +16,7 @@ from qt.core import (
QKeySequence, QLabel, QLineEdit, QMenu, QPalette, QPlainTextEdit, QPushButton, QKeySequence, QLabel, QLineEdit, QMenu, QPalette, QPlainTextEdit, QPushButton,
QSize, QSyntaxHighlighter, Qt, QTabWidget, QTextBlockFormat, QTextCharFormat, QSize, QSyntaxHighlighter, Qt, QTabWidget, QTextBlockFormat, QTextCharFormat,
QTextCursor, QTextEdit, QTextFormat, QTextFrameFormat, QTextListFormat, QTimer, QTextCursor, QTextEdit, QTextFormat, QTextFrameFormat, QTextListFormat, QTimer,
QToolButton, QUrl, QVBoxLayout, QWidget, pyqtSignal, pyqtSlot, QToolButton, QUrl, QVBoxLayout, QWidget, pyqtSignal, pyqtSlot, QPointF, QTextDocument
) )
from calibre import xml_replace_entities from calibre import xml_replace_entities
@ -909,27 +909,42 @@ class EditorWidget(QTextEdit, LineEditECM): # {{{
c.deleteChar() c.deleteChar()
c.insertImage(fmt.toImageFormat(), alignment) c.insertImage(fmt.toImageFormat(), alignment)
def first_image_replacement_char_position_for(self, image_name):
d = self.document()
c = self.textCursor()
c.setPosition(0)
while True:
c = d.find('\ufffc', c, QTextDocument.FindFlag.FindCaseSensitively)
if c.isNull():
break
fmt = c.charFormat()
if fmt.isImageFormat() and fmt.toImageFormat().name() == image_name:
return c.position()
return -1
def contextMenuEvent(self, ev): def contextMenuEvent(self, ev):
menu = QMenu(self) menu = QMenu(self)
# unfortunately there appears to be no way to get the image under the img_name = self.document().documentLayout().imageAt(QPointF(ev.pos()))
# mouse for floating images. if img_name:
c = self.cursorForPosition(ev.pos()) pos = self.first_image_replacement_char_position_for(img_name)
fmt = c.charFormat() if pos > -1:
if fmt.isImageFormat() and c.currentFrame(): c = self.textCursor()
cf = c.currentFrame().childFrames() c.clearSelection()
pos = QTextFrameFormat.Position.InFlow c.setPosition(pos)
if len(cf) == 1: cf = c.currentFrame().childFrames()
pos = cf[0].frameFormat().position() pos = QTextFrameFormat.Position.InFlow
align_menu = menu.addMenu(QIcon.ic('view-image.png'), _('Change image alignment...')) if len(cf) == 1:
def a(text, epos): pos = cf[0].frameFormat().position()
ac = align_menu.addAction(text) align_menu = menu.addMenu(QIcon.ic('view-image.png'), _('Change image alignment...'))
ac.setCheckable(True) def a(text, epos):
ac.triggered.connect(partial(self.align_image_at, c.position(), epos)) ac = align_menu.addAction(text)
if pos == epos: ac.setCheckable(True)
ac.setChecked(True) ac.triggered.connect(partial(self.align_image_at, c.position(), epos))
a(_('Float to the left'), QTextFrameFormat.Position.FloatLeft) if pos == epos:
a(_('Inline with text'), QTextFrameFormat.Position.InFlow) ac.setChecked(True)
a(_('Float to the right'), QTextFrameFormat.Position.FloatRight) a(_('Float to the left'), QTextFrameFormat.Position.FloatLeft)
a(_('Inline with text'), QTextFrameFormat.Position.InFlow)
a(_('Float to the right'), QTextFrameFormat.Position.FloatRight)
for ac in 'undo redo -- cut copy paste paste_and_match_style -- select_all'.split(): for ac in 'undo redo -- cut copy paste paste_and_match_style -- select_all'.split():
if ac == '--': if ac == '--':
menu.addSeparator() menu.addSeparator()