Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mig5-fix_spelling_grammar_receiver_mode' into receiver-mode-gui

Browse Source
This commit is contained in:
Micah Lee 2018-09-02 22:59:13 -07:00
commit 62c443f2fd
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
onionshare/common.py
View File

@ -322,7 +322,7 @@ class Common(object):
font-size: 11px;
}""",
# Recieve mode and child widget styles
# Receive mode and child widget styles
'receive_file': """
QWidget {
background-color: #ffffff;

2
onionshare_gui/onionshare_gui.py
View File

@ -167,7 +167,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.setCentralWidget(central_widget)
self.show()
# The servers isn't active yet
# The server isn't active yet
self.set_server_active(False)
# Create the timer

6
test/test_onionshare_web.py
View File

@ -38,11 +38,11 @@ DEFAULT_ZW_FILENAME_REGEX = re.compile(r'^onionshare_[a-z2-7]{6}.zip$')
RANDOM_STR_REGEX = re.compile(r'^[a-z2-7]+$')
def web_obj(common_obj, recieve_mode, num_files=0):
def web_obj(common_obj, receive_mode, num_files=0):
""" Creates a Web object, in either share mode or receive mode, ready for testing """
common_obj.load_settings()
web = Web(common_obj, False, recieve_mode)
web = Web(common_obj, False, receive_mode)
web.generate_slug()
web.stay_open = True
web.running = True
@ -50,7 +50,7 @@ def web_obj(common_obj, recieve_mode, num_files=0):
web.app.testing = True
# Share mode
if not recieve_mode:
if not receive_mode:
# Add files
files = []
for i in range(num_files):