Mirrors
/
DeDRM_tools
mirror of https://github.com/noDRM/DeDRM_tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make plugin work in Calibre 6 (Qt 6)

This commit is contained in:
NoDRM 2022-01-02 21:18:13 +01:00
parent f17b255159
commit 5b3e3e420f
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DeDRM_plugin/adobekey.py
View File

@ -136,7 +136,7 @@ if iswindows:
if os.path.isfile(os.path.join(p, "libcrypto-1_1.dll")):
return os.path.join(p, "libcrypto-1_1.dll")
if os.path.isfile(os.path.join(p, "libeay32.dll")):
return os.path.join(p, "libeay.dll")
return os.path.join(p, "libeay32.dll")
return None
def _load_crypto_libcrypto():

10
DeDRM_plugin/config.py
View File

@ -327,7 +327,13 @@ class ManageKeysDialog(QDialog):
self.export_key_button.setIcon(QIcon(I('save.png')))
self.export_key_button.clicked.connect(self.export_key)
button_layout.addWidget(self.export_key_button)
spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
try:
# QT 6
spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Policy.Minimum, QtGui.QSizePolicy.Policy.Expanding)
except AttributeError:
# QT 5
spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
button_layout.addItem(spacerItem)
if self.wineprefix is not None:
@ -811,7 +817,7 @@ class AddBandNKeyDialog(QDialog):
self.cbType.addItem("Extract passhashes from Adobe Digital Editions")
self.cbType.addItem("Extract key from Nook Windows application")
self.cbType.addItem("Extract key from Nook Android application")
self.cbType.currentIndexChanged.connect(self.update_form, self.cbType.currentIndex())
self.cbType.currentIndexChanged.connect(lambda: self.update_form(self.cbType.currentIndex()))
self.layout.addWidget(self.cbType)
self.button_box = QDialogButtonBox(QDialogButtonBox.Cancel)

8
DeDRM_plugin/standalone/remove_drm.py
View File

@ -142,7 +142,7 @@ def perform_action(params, files):
return 0
if overwrite_original and (output is not None or outputdir is not None):
print("Can't use --overwrite together with --output or --outputdir.")
print("Can't use --overwrite together with --output or --outputdir.", file=sys.stderr)
return 1
if output is not None and os.path.isfile(output) and not force:
@ -155,8 +155,8 @@ def perform_action(params, files):
return 1
if outputdir is not None and output is not None and os.path.isabs(output):
print("--output parameter is absolute path despite --outputdir being set.")
print("Remove --outputdir, or give a relative path to --output.")
print("--output parameter is absolute path despite --outputdir being set.", file=sys.stderr)
print("Remove --outputdir, or give a relative path to --output.", file=sys.stderr)
return 1
@ -166,7 +166,7 @@ def perform_action(params, files):
file = os.path.abspath(file)
if not os.path.isfile(file):
print("Skipping file " + file + " - not found.")
print("Skipping file " + file + " - not found.", file=sys.stderr)
continue
if overwrite_original:

8
Obok_plugin/config.py
View File

@ -118,7 +118,13 @@ class ManageKeysDialog(QDialog):
self._delete_key_button.clicked.connect(self.delete_key)
button_layout.addWidget(self._delete_key_button)
spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
try:
# QT 6
spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Policy.Minimum, QtGui.QSizePolicy.Policy.Expanding)
except AttributeError:
# QT 5
spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
button_layout.addItem(spacerItem)
layout.addSpacing(5)