Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-12-17 01:04:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Added popup for accepted file formats

Browse source
This commit is contained in:
akrq27 2023-12-13 02:02:59 -06:00
parent 2a5b75ceb2
commit 2358bf46ac
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
desktop/onionshare/resources/locale/en.json
View file

@ -9,6 +9,7 @@
"gui_add": "Add", "gui_add": "Add",
"gui_add_files": "Add Files", "gui_add_files": "Add Files",
"gui_add_folder": "Add Folder", "gui_add_folder": "Add Folder",
"gui_accepted_files": "Accepted File Types",
"gui_remove": "Remove", "gui_remove": "Remove",
"gui_dragdrop_sandbox_flatpak": "To make the Flatpak sandbox more secure, drag and drop is not supported. Use the \"Add Files\" and \"Add Folder\" buttons to select files instead.", "gui_dragdrop_sandbox_flatpak": "To make the Flatpak sandbox more secure, drag and drop is not supported. Use the \"Add Files\" and \"Add Folder\" buttons to select files instead.",
"gui_file_selection_remove_all": "Remove All", "gui_file_selection_remove_all": "Remove All",

29
desktop/onionshare/tab/mode/file_selection.py
View file

@ -19,7 +19,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
import os import os
from typing import Optional
from PySide6 import QtCore, QtWidgets, QtGui from PySide6 import QtCore, QtWidgets, QtGui
import PySide6.QtCore
import PySide6.QtWidgets
from ... import strings from ... import strings
from ...widgets import Alert, AddFileDialog from ...widgets import Alert, AddFileDialog
@ -342,6 +345,14 @@ class FileList(QtWidgets.QListWidget):
self.files_updated.emit() self.files_updated.emit()
class PopUp(QtWidgets.QWidget):
def __init__(self):
super().__init__()
layout = QtWidgets.QVBoxLayout()
self.setWindowTitle(strings._("gui_accepted_files"))
self.label = QtWidgets.QLabel("Acceptable file formats include: HTML, CSS, JavaScript, and image files\nIf you add an index.html file, it will render when someone loads your website.\nNote that OnioneShare only supports hosting static websites.")
layout.addWidget(self.label)
self.setLayout(layout)
class FileSelection(QtWidgets.QVBoxLayout): class FileSelection(QtWidgets.QVBoxLayout):
""" """
@ -354,6 +365,7 @@ class FileSelection(QtWidgets.QVBoxLayout):
self.common = common self.common = common
self.parent = parent self.parent = parent
self.popup = None
self.server_on = False self.server_on = False
@ -381,6 +393,8 @@ class FileSelection(QtWidgets.QVBoxLayout):
else: else:
self.add_button = QtWidgets.QPushButton(strings._("gui_add")) self.add_button = QtWidgets.QPushButton(strings._("gui_add"))
self.add_button.clicked.connect(self.add) self.add_button.clicked.connect(self.add)
self.accepted_button = QtWidgets.QPushButton(strings._("gui_accepted_files"))
self.accepted_button.clicked.connect(self.popupWindow)
self.remove_button = QtWidgets.QPushButton(strings._("gui_remove")) self.remove_button = QtWidgets.QPushButton(strings._("gui_remove"))
self.remove_button.clicked.connect(self.delete) self.remove_button.clicked.connect(self.delete)
button_layout = QtWidgets.QHBoxLayout() button_layout = QtWidgets.QHBoxLayout()
@ -391,6 +405,7 @@ class FileSelection(QtWidgets.QVBoxLayout):
else: else:
button_layout.addWidget(self.add_button) button_layout.addWidget(self.add_button)
button_layout.addWidget(self.remove_button) button_layout.addWidget(self.remove_button)
button_layout.addWidget(self.accepted_button)
# Add the widgets # Add the widgets
self.addWidget(self.file_list) self.addWidget(self.file_list)
@ -410,12 +425,14 @@ class FileSelection(QtWidgets.QVBoxLayout):
else: else:
self.add_button.hide() self.add_button.hide()
self.remove_button.hide() self.remove_button.hide()
self.accepted_button.hide()
else: else:
if self.sandbox: if self.sandbox:
self.add_files_button.show() self.add_files_button.show()
self.add_folder_button.show() self.add_folder_button.show()
else: else:
self.add_button.show() self.add_button.show()
self.accepted_button.show()
# Delete button should be hidden if item isn't selected # Delete button should be hidden if item isn't selected
if len(self.file_list.selectedItems()) == 0: if len(self.file_list.selectedItems()) == 0:
@ -473,6 +490,18 @@ class FileSelection(QtWidgets.QVBoxLayout):
self.file_list.setCurrentItem(None) self.file_list.setCurrentItem(None)
self.update() self.update()
def popupWindow(self):
"""
Accepted File Types button clicked
"""
self.common.log("FileSelection", "popup")
if self.popup is None:
self.popup = PopUp()
self.popup.show()
else:
self.popup.close()
self.popup = None
def delete(self): def delete(self):
""" """
Delete button clicked Delete button clicked