Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-14 05:31:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_spelling_grammar_receiver_mode' of https://github.com/mig5/onionshare into mig5-fix_spelling_grammar_receiver_mode

Browse Source
This commit is contained in:
Micah Lee 2018-09-02 22:59:06 -07:00
commit 54c98f0b57
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; font-size: 11px;
}""", }""",
# Recieve mode and child widget styles # Receive mode and child widget styles
'receive_file': """ 'receive_file': """
QWidget { QWidget {
background-color: #ffffff; background-color: #ffffff;

2
onionshare_gui/onionshare_gui.py
View File

@ -167,7 +167,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.setCentralWidget(central_widget) self.setCentralWidget(central_widget)
self.show() self.show()
# The servers isn't active yet # The server isn't active yet
self.set_server_active(False) self.set_server_active(False)
# Create the timer # 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]+$') 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 """ """ Creates a Web object, in either share mode or receive mode, ready for testing """
common_obj.load_settings() common_obj.load_settings()
web = Web(common_obj, False, recieve_mode) web = Web(common_obj, False, receive_mode)
web.generate_slug() web.generate_slug()
web.stay_open = True web.stay_open = True
web.running = True web.running = True
@ -50,7 +50,7 @@ def web_obj(common_obj, recieve_mode, num_files=0):
web.app.testing = True web.app.testing = True
# Share mode # Share mode
if not recieve_mode: if not receive_mode:
# Add files # Add files
files = [] files = []
for i in range(num_files): for i in range(num_files):