diff options
| author | Miguel Jacq <mig@mig5.net> | 2017-05-21 16:14:32 +1000 |
|---|---|---|
| committer | Miguel Jacq <mig@mig5.net> | 2017-05-21 16:14:32 +1000 |
| commit | b35e3b76d586f39f29cf4049a02ab2d028a0d40d (patch) | |
| tree | 97e64b320b3e95f36e1d13c657b657e7231ab1a5 | |
| parent | d3eeda887bbd9eaffbd559bcd1d989ce732aa44d (diff) | |
| download | onionshare-b35e3b76d586f39f29cf4049a02ab2d028a0d40d.tar.gz onionshare-b35e3b76d586f39f29cf4049a02ab2d028a0d40d.zip | |
Make it possible to select multiple folders by using non-native QFileDialog
| -rw-r--r-- | onionshare_gui/file_selection.py | 18 | ||||
| -rw-r--r-- | share/locale/en.json | 2 | ||||
| -rw-r--r-- | share/locale/fr.json | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/onionshare_gui/file_selection.py b/onionshare_gui/file_selection.py index 2ebbbb75..0de96e02 100644 --- a/onionshare_gui/file_selection.py +++ b/onionshare_gui/file_selection.py @@ -225,10 +225,20 @@ class FileSelection(QtWidgets.QVBoxLayout): """ Add folder button clicked. """ - filename = QtWidgets.QFileDialog.getExistingDirectory( - caption=strings._('gui_choose_folder', True), options=QtWidgets.QFileDialog.ReadOnly) - if filename: - self.file_list.add_file(str(filename)) + file_dialog = QtWidgets.QFileDialog(caption=strings._('gui_choose_folder', True)) + file_dialog.setFileMode(QtWidgets.QFileDialog.Directory) + file_dialog.setOption(QtWidgets.QFileDialog.DontUseNativeDialog, True) + file_dialog.setOption(QtWidgets.QFileDialog.ReadOnly, True) + file_dialog.setOption(QtWidgets.QFileDialog.ShowDirsOnly, True) + tree_view = file_dialog.findChild(QtWidgets.QTreeView) + tree_view.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) + list_view = file_dialog.findChild(QtWidgets.QListView, "listView") + list_view.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) + + if file_dialog.exec_() == QtWidgets.QDialog.Accepted: + for filename in file_dialog.selectedFiles(): + self.file_list.add_file(filename) + self.update() def delete_file(self): diff --git a/share/locale/en.json b/share/locale/en.json index 701b067c..2b4fa116 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -24,7 +24,7 @@ "help_filename": "List of files or folders to share", "gui_drag_and_drop": "Drag and drop\nfiles here", "gui_add_files": "Add Files", - "gui_add_folder": "Add Folder", + "gui_add_folder": "Add Folders", "gui_delete": "Delete", "gui_choose_files": "Choose files", "gui_choose_folder": "Choose folder", diff --git a/share/locale/fr.json b/share/locale/fr.json index ce9cfa15..842bf22b 100644 --- a/share/locale/fr.json +++ b/share/locale/fr.json @@ -21,7 +21,7 @@ "help_filename": "Liste des fichiers ou dossiers à partager", "gui_drag_and_drop": "Glissez déposez\nles fichiers ici", "gui_add_files": "Ajouter des fichiers", - "gui_add_folder": "Ajouter un dossier", + "gui_add_folder": "Ajouter des dossiers", "gui_delete": "Supprimer", "gui_choose_files": "Sélectionnez des fichiers", "gui_choose_folder": "Sélectionnez un dossier", |