mirror of
				https://github.com/kovidgoyal/calibre.git
				synced 2025-11-04 03:27:00 -05:00 
			
		
		
		
	Forgot that the ToC editor in the edit book tool uses a different code path. Copy over the macOS workaround.
This commit is contained in:
		
							parent
							
								
									2d2cea29e0
								
							
						
					
					
						commit
						6be2cc69a8
					
				@ -5,14 +5,15 @@ __license__ = 'GPL v3'
 | 
				
			|||||||
__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 | 
					__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from qt.core import (
 | 
					from qt.core import (
 | 
				
			||||||
    QAction, QApplication, QDialog, QDialogButtonBox, QGridLayout, QIcon, QMenu,
 | 
					    QAction, QApplication, QDialog, QDialogButtonBox, QGridLayout, QIcon, QMenu, QSize,
 | 
				
			||||||
    QSize, QStackedWidget, QStyledItemDelegate, Qt, QTimer, QTreeWidget,
 | 
					    QStackedWidget, QStyledItemDelegate, Qt, QTimer, QTreeWidget, QTreeWidgetItem,
 | 
				
			||||||
    QTreeWidgetItem, QVBoxLayout, QWidget, pyqtSignal
 | 
					    QVBoxLayout, QWidget, pyqtSignal,
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
from time import monotonic
 | 
					from time import monotonic
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					from calibre.constants import ismacos
 | 
				
			||||||
from calibre.ebooks.oeb.polish.toc import commit_toc, get_toc
 | 
					from calibre.ebooks.oeb.polish.toc import commit_toc, get_toc
 | 
				
			||||||
from calibre.gui2 import error_dialog, make_view_use_window_background
 | 
					from calibre.gui2 import error_dialog, info_dialog, make_view_use_window_background
 | 
				
			||||||
from calibre.gui2.toc.main import ItemEdit, TOCView
 | 
					from calibre.gui2.toc.main import ItemEdit, TOCView
 | 
				
			||||||
from calibre.gui2.tweak_book import TOP, actions, current_container, tprefs
 | 
					from calibre.gui2.tweak_book import TOP, actions, current_container, tprefs
 | 
				
			||||||
from calibre_extensions.progress_indicator import set_no_activate_on_click
 | 
					from calibre_extensions.progress_indicator import set_no_activate_on_click
 | 
				
			||||||
@ -61,6 +62,15 @@ class TOCEditor(QDialog):
 | 
				
			|||||||
    def add_new_item(self, item, where):
 | 
					    def add_new_item(self, item, where):
 | 
				
			||||||
        self.item_edit(item, where)
 | 
					        self.item_edit(item, where)
 | 
				
			||||||
        self.stacks.setCurrentIndex(1)
 | 
					        self.stacks.setCurrentIndex(1)
 | 
				
			||||||
 | 
					        if ismacos:
 | 
				
			||||||
 | 
					            QTimer.singleShot(0, self.workaround_macos_mouse_with_webview_bug)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def workaround_macos_mouse_with_webview_bug(self):
 | 
				
			||||||
 | 
					        # macOS is weird: https://bugs.launchpad.net/calibre/+bug/2004639
 | 
				
			||||||
 | 
					        # needed as of Qt 6.4.2
 | 
				
			||||||
 | 
					        d = info_dialog(self, _('Loading...'), _('Loading view, please wait...'), show_copy_button=False)
 | 
				
			||||||
 | 
					        QTimer.singleShot(0, d.reject)
 | 
				
			||||||
 | 
					        d.exec()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def accept(self):
 | 
					    def accept(self):
 | 
				
			||||||
        if monotonic() - self.last_accept_at < 1:
 | 
					        if monotonic() - self.last_accept_at < 1:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user