almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Remove QVariant, to finish porting from PyQt5 to PySide2

Browse source
This commit is contained in:
Micah Lee 2020-10-26 15:12:17 -07:00
parent 92b19fe1b3
commit 50044a05fa
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dangerzone/settings_widget.py
View file

@ -50,9 +50,7 @@ class SettingsWidget(QtWidgets.QWidget):
self.open_checkbox.clicked.connect(self.update_ui) self.open_checkbox.clicked.connect(self.update_ui)
self.open_combobox = QtWidgets.QComboBox() self.open_combobox = QtWidgets.QComboBox()
for k in self.global_common.pdf_viewers: for k in self.global_common.pdf_viewers:
self.open_combobox.addItem( self.open_combobox.addItem(k, self.global_common.pdf_viewers[k])
k, QtCore.QVariant(self.global_common.pdf_viewers[k])
)
open_layout = QtWidgets.QHBoxLayout() open_layout = QtWidgets.QHBoxLayout()
open_layout.addWidget(self.open_checkbox) open_layout.addWidget(self.open_checkbox)
open_layout.addWidget(self.open_combobox) open_layout.addWidget(self.open_combobox)
@ -62,9 +60,7 @@ class SettingsWidget(QtWidgets.QWidget):
self.ocr_checkbox = QtWidgets.QCheckBox("OCR document, language") self.ocr_checkbox = QtWidgets.QCheckBox("OCR document, language")
self.ocr_combobox = QtWidgets.QComboBox() self.ocr_combobox = QtWidgets.QComboBox()
for k in self.global_common.ocr_languages: for k in self.global_common.ocr_languages:
self.ocr_combobox.addItem( self.ocr_combobox.addItem(k, self.global_common.ocr_languages[k])
k, QtCore.QVariant(self.global_common.ocr_languages[k])
)
ocr_layout = QtWidgets.QHBoxLayout() ocr_layout = QtWidgets.QHBoxLayout()
ocr_layout.addWidget(self.ocr_checkbox) ocr_layout.addWidget(self.ocr_checkbox)
ocr_layout.addWidget(self.ocr_combobox) ocr_layout.addWidget(self.ocr_combobox)
@ -143,7 +139,10 @@ class SettingsWidget(QtWidgets.QWidget):
self.update_checkbox.hide() self.update_checkbox.hide()
else: else:
with self.global_common.exec_dangerzone_container( with self.global_common.exec_dangerzone_container(
["ls", self.global_common.get_container_name(),] [
"ls",
self.global_common.get_container_name(),
]
) as p: ) as p:
stdout_data, stderror_data = p.communicate() stdout_data, stderror_data = p.communicate()