Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-08 17:34:56 -04:00
Code Issues Projects Releases Packages 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
Download patch file Download diff file Expand all files Collapse all files

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'))
else:
self.server_button.setText(strings._('gui_receive_stop_server'))
<<<<<<< HEAD
if self.common.settings.get('autostart_timer'):
self.autostart_timer_container.hide()
if self.common.settings.get('autostop_timer'):
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")))
=======
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:
self.server_button.setStyleSheet(self.common.css['server_status_button_working'])
self.server_button.setEnabled(True)