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

Fix context menu for images when multiple images are present

Browse Source
This commit is contained in:
Kovid Goyal 2023-10-21 12:43:58 +05:30
parent ec86d24535
commit a583773bfe
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -913,11 +913,11 @@ class EditorWidget(QTextEdit, LineEditECM): # {{{
c.setPosition(cursor_pos) c.setPosition(cursor_pos)
fmt = c.charFormat() fmt = c.charFormat()
if fmt.isImageFormat() and c.currentFrame(): if fmt.isImageFormat() and c.currentFrame():
cf = c.currentFrame().childFrames() f = self.frame_for_cursor(c)
if len(cf) == 1: if f is not None:
ff = cf[0].frameFormat() ff = f.frameFormat()
ff.setPosition(alignment) ff.setPosition(alignment)
cf[0].setFrameFormat(ff) f.setFrameFormat(ff)
self.document().markContentsDirty(cursor_pos-2, 5) self.document().markContentsDirty(cursor_pos-2, 5)
else: else:
c.deleteChar() c.deleteChar()
@ -936,6 +936,14 @@ class EditorWidget(QTextEdit, LineEditECM): # {{{
return c.position() return c.position()
return -1 return -1
def frame_for_cursor(self, c):
q = c.position()
for cf in c.currentFrame().childFrames():
a, b = cf.firstPosition(), cf.lastPosition()
a, b = min(a, b), max(a, b)
if a <= q <= b:
return cf
def contextMenuEvent(self, ev): def contextMenuEvent(self, ev):
menu = QMenu(self) menu = QMenu(self)
img_name = self.document().documentLayout().imageAt(QPointF(ev.pos())) img_name = self.document().documentLayout().imageAt(QPointF(ev.pos()))
@ -945,10 +953,10 @@ class EditorWidget(QTextEdit, LineEditECM): # {{{
c = self.textCursor() c = self.textCursor()
c.clearSelection() c.clearSelection()
c.setPosition(pos) c.setPosition(pos)
cf = c.currentFrame().childFrames()
pos = QTextFrameFormat.Position.InFlow pos = QTextFrameFormat.Position.InFlow
if len(cf) == 1: ff = self.frame_for_cursor(c)
pos = cf[0].frameFormat().position() if ff is not None:
pos = ff.frameFormat().position()
align_menu = menu.addMenu(QIcon.ic('view-image.png'), _('Image...')) align_menu = menu.addMenu(QIcon.ic('view-image.png'), _('Image...'))
def a(text, epos): def a(text, epos):
ac = align_menu.addAction(text) ac = align_menu.addAction(text)
@ -1391,6 +1399,7 @@ if __name__ == '__main__':
set <u>out</u> to have an <em>affair</em>, <span style="font-style:italic; background-color:red"> set <u>out</u> to have an <em>affair</em>, <span style="font-style:italic; background-color:red">
much</span> less a <s>long-term</s>, <b>devoted</b> one.</span><p>hello''' much</span> less a <s>long-term</s>, <b>devoted</b> one.</span><p>hello'''
w.html = '<div><p id="moo" align="justify">Testing <em>a</em> link.</p><p align="justify">\xa0</p><p align="justify">ss</p></div>' w.html = '<div><p id="moo" align="justify">Testing <em>a</em> link.</p><p align="justify">\xa0</p><p align="justify">ss</p></div>'
w.html = '<p>Testing <img src="file:///home/kovid/work/calibre/resources/images/donate.png"> img</p>' i = 'file:///home/kovid/work/calibre/resources/images/'
w.html = f'<p>Testing <img src="{i}/donate.png"> img and another <img src="{i}/lt.png">file</p>'
app.exec() app.exec()
# print w.html # print w.html