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

Fix merge conflicts with upstream

Browse Source
This commit is contained in:
hiro 2019-04-23 16:20:33 +02:00
parent 0c6dbe4c8a
commit 357374c147
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
onionshare/web/website_mode.py
View File

@ -81,8 +81,6 @@ class WebsiteModeWeb(object):
self.web.add_request(self.web.REQUEST_LOAD, request.path) self.web.add_request(self.web.REQUEST_LOAD, request.path)
print(self.file_info)
filelist = [] filelist = []
if self.file_info['files']: if self.file_info['files']:
self.website_folder = os.path.dirname(self.file_info['files'][0]['filename']) self.website_folder = os.path.dirname(self.file_info['files'][0]['filename'])

8
onionshare_gui/mode/website_mode/__init__.py
View File

@ -75,9 +75,9 @@ class WebsiteMode(Mode):
# Download history # Download history
self.history = History( self.history = History(
self.common, self.common,
QtGui.QPixmap.fromImage(QtGui.QImage(self.common.get_resource_path('images/downloads_transparent.png'))), QtGui.QPixmap.fromImage(QtGui.QImage(self.common.get_resource_path('images/share_icon_transparent.png'))),
strings._('gui_no_downloads'), strings._('gui_share_mode_no_files'),
strings._('gui_downloads') strings._('gui_all_modes_history')
) )
self.history.hide() self.history.hide()
@ -216,7 +216,7 @@ class WebsiteMode(Mode):
""" """
Handle REQUEST_LOAD event. Handle REQUEST_LOAD event.
""" """
self.system_tray.showMessage(strings._('systray_site_loaded_title'), strings._('systray_site_page_loaded_message')) self.system_tray.showMessage(strings._('systray_site_loaded_title'), strings._('systray_site_loaded_message'))
def handle_request_started(self, event): def handle_request_started(self, event):
""" """

12
onionshare_gui/server_status.py
View File

@ -289,23 +289,11 @@ class ServerStatus(QtWidgets.QWidget):
self.server_button.setText(strings._('gui_share_stop_server')) self.server_button.setText(strings._('gui_share_stop_server'))
else: else:
self.server_button.setText(strings._('gui_receive_stop_server')) self.server_button.setText(strings._('gui_receive_stop_server'))
<<<<<<< HEAD
if self.common.settings.get('autostart_timer'): if self.common.settings.get('autostart_timer'):
self.autostart_timer_container.hide() self.autostart_timer_container.hide()
if self.common.settings.get('autostop_timer'): if self.common.settings.get('autostop_timer'):
self.autostop_timer_container.hide() self.autostop_timer_container.hide()
self.server_button.setToolTip(strings._('gui_stop_server_autostop_timer_tooltip').format(self.autostop_timer_widget.dateTime().toString("h:mm AP, MMMM dd, yyyy"))) self.server_button.setToolTip(strings._('gui_stop_server_autostop_timer_tooltip').format(self.autostop_timer_widget.dateTime().toString("h:mm AP, MMMM dd, yyyy")))
=======
if self.common.settings.get('shutdown_timeout'):
self.shutdown_timeout_container.hide()
if self.mode == ServerStatus.MODE_SHARE:
self.server_button.setToolTip(strings._('gui_share_stop_server_shutdown_timeout_tooltip').format(self.timeout))
if self.mode == ServerStatus.MODE_WEBSITE:
self.server_button.setToolTip(strings._('gui_share_stop_server_shutdown_timeout_tooltip').format(self.timeout))
else:
self.server_button.setToolTip(strings._('gui_receive_stop_server_shutdown_timeout_tooltip').format(self.timeout))
>>>>>>> Add gui for website sharing and listing
elif self.status == self.STATUS_WORKING: elif self.status == self.STATUS_WORKING:
self.server_button.setStyleSheet(self.common.css['server_status_button_working']) self.server_button.setStyleSheet(self.common.css['server_status_button_working'])
self.server_button.setEnabled(True) self.server_button.setEnabled(True)

2
share/locale/en.json
View File

@ -147,6 +147,8 @@
"systray_menu_exit": "Quit", "systray_menu_exit": "Quit",
"systray_page_loaded_title": "Page Loaded", "systray_page_loaded_title": "Page Loaded",
"systray_page_loaded_message": "OnionShare address loaded", "systray_page_loaded_message": "OnionShare address loaded",
"systray_site_loaded_title": "Site Loaded",
"systray_site_loaded_message": "OnionShare site loaded",
"systray_share_started_title": "Sharing Started", "systray_share_started_title": "Sharing Started",
"systray_share_started_message": "Starting to send files to someone", "systray_share_started_message": "Starting to send files to someone",
"systray_share_completed_title": "Sharing Complete", "systray_share_completed_title": "Sharing Complete",