mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix #1654071 [from-source ebook-edit errors on Plasma](https://bugs.launchpad.net/calibre/+bug/1654071)
This commit is contained in:
parent
066fbef6f6
commit
257ef9ad9b
@ -869,6 +869,7 @@ class MergeDialog(QDialog): # {{{
|
||||
|
||||
def __init__(self, names, parent=None):
|
||||
QDialog.__init__(self, parent)
|
||||
self.names = names
|
||||
self.setWindowTitle(_('Choose master file'))
|
||||
self.l = l = QVBoxLayout()
|
||||
self.setLayout(l)
|
||||
@ -894,9 +895,9 @@ class MergeDialog(QDialog): # {{{
|
||||
|
||||
@property
|
||||
def ans(self):
|
||||
for b in self.buttons:
|
||||
for n, b in zip(self.names, self.buttons):
|
||||
if b.isChecked():
|
||||
return unicode(b.text())
|
||||
return n
|
||||
|
||||
# }}}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user