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

Rename document_selected to documents_selected

Browse source
This commit is contained in:
deeplow 2022-11-16 08:56:21 +00:00
parent aba699a238
commit 8b3739707d
No known key found for this signature in database
GPG key ID: 577982871529A52A
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dangerzone/gui/__init__.py
View file

@ -83,7 +83,9 @@ def gui_main(filenames: Optional[List[str]]) -> bool:
window = MainWindow(dangerzone) window = MainWindow(dangerzone)
if filenames: if filenames:
documents = [Document(filename) for filename in filenames] documents = [Document(filename) for filename in filenames]
window.content_widget.doc_selection_widget.document_selected.emit(documents) window.content_widget.doc_selection_widget.documents_selected.emit(
documents
)
return window return window
window = new_window(filenames) window = new_window(filenames)

20
dangerzone/gui/main_window.py
View file

@ -212,20 +212,20 @@ class ContentWidget(QtWidgets.QWidget):
# Doc selection widget # Doc selection widget
self.doc_selection_widget = DocSelectionWidget() self.doc_selection_widget = DocSelectionWidget()
self.doc_selection_widget.document_selected.connect(self.document_selected) self.doc_selection_widget.documents_selected.connect(self.documents_selected)
# Settings # Settings
self.settings_widget = SettingsWidget(self.dangerzone) self.settings_widget = SettingsWidget(self.dangerzone)
self.doc_selection_widget.document_selected.connect( self.doc_selection_widget.documents_selected.connect(
self.settings_widget.document_selected self.settings_widget.documents_selected
) )
self.settings_widget.start_clicked.connect(self.start_clicked) self.settings_widget.start_clicked.connect(self.start_clicked)
self.settings_widget.hide() self.settings_widget.hide()
# Convert # Convert
self.documents_list = DocumentsListWidget(self.dangerzone) self.documents_list = DocumentsListWidget(self.dangerzone)
self.doc_selection_widget.document_selected.connect( self.doc_selection_widget.documents_selected.connect(
self.documents_list.document_selected self.documents_list.documents_selected
) )
self.settings_widget.start_clicked.connect(self.documents_list.start_conversion) self.settings_widget.start_clicked.connect(self.documents_list.start_conversion)
self.documents_list.hide() self.documents_list.hide()
@ -237,7 +237,7 @@ class ContentWidget(QtWidgets.QWidget):
layout.addWidget(self.doc_selection_widget, stretch=1) layout.addWidget(self.doc_selection_widget, stretch=1)
self.setLayout(layout) self.setLayout(layout)
def document_selected(self, selected_docs: List[Document]) -> None: def documents_selected(self, selected_docs: List[Document]) -> None:
self.doc_selection_widget.hide() self.doc_selection_widget.hide()
self.settings_widget.show() self.settings_widget.show()
@ -247,7 +247,7 @@ class ContentWidget(QtWidgets.QWidget):
class DocSelectionWidget(QtWidgets.QWidget): class DocSelectionWidget(QtWidgets.QWidget):
document_selected = QtCore.Signal(list) documents_selected = QtCore.Signal(list)
def __init__(self) -> None: def __init__(self) -> None:
super(DocSelectionWidget, self).__init__() super(DocSelectionWidget, self).__init__()
@ -286,7 +286,7 @@ class DocSelectionWidget(QtWidgets.QWidget):
return return
documents = [Document(filename) for filename in filenames] documents = [Document(filename) for filename in filenames]
self.document_selected.emit(documents) self.documents_selected.emit(documents)
class SettingsWidget(QtWidgets.QWidget): class SettingsWidget(QtWidgets.QWidget):
@ -469,7 +469,7 @@ class SettingsWidget(QtWidgets.QWidget):
else: else:
self.start_button.setDisabled(True) self.start_button.setDisabled(True)
def document_selected(self, selected_docs: List[Document]) -> None: def documents_selected(self, selected_docs: List[Document]) -> None:
first_doc = selected_docs[0] first_doc = selected_docs[0]
# set the default save location as the directory for the first document # set the default save location as the directory for the first document
save_path = os.path.dirname(first_doc.input_filename) save_path = os.path.dirname(first_doc.input_filename)
@ -576,7 +576,7 @@ class DocumentsListWidget(QtWidgets.QListWidget):
# to ensure docker-daemon detection logic runs first # to ensure docker-daemon detection logic runs first
self.thread_pool_initized = False self.thread_pool_initized = False
def document_selected(self, selected_docs: List[Document]) -> None: def documents_selected(self, selected_docs: List[Document]) -> None:
for document in selected_docs: for document in selected_docs:
self.dangerzone.add_document(document) self.dangerzone.add_document(document)
item = QtWidgets.QListWidgetItem() item = QtWidgets.QListWidgetItem()