Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-07-28 00:55:40 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move server status indicator to the status bar at the bottom

Browse source
This commit is contained in:
Micah Lee 2018-02-06 19:31:02 -08:00
parent 370b1bfc45
commit 2e2c3c275e
3 changed files with 40 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
onionshare_gui/server_status.py
View file

@ -78,16 +78,8 @@ class ServerStatus(QtWidgets.QWidget):
self.server_shutdown_timeout_container.setLayout(shutdown_timeout_container_layout)
# Server layout
self.status_image_stopped = QtGui.QImage(common.get_resource_path('images/server_stopped.png'))
self.status_image_working = QtGui.QImage(common.get_resource_path('images/server_working.png'))
self.status_image_started = QtGui.QImage(common.get_resource_path('images/server_started.png'))
self.status_image_label = QtWidgets.QLabel()
self.status_image_label.setFixedWidth(30)
self.server_button = QtWidgets.QPushButton()
self.server_button.clicked.connect(self.server_button_clicked)
server_layout = QtWidgets.QHBoxLayout()
server_layout.addWidget(self.status_image_label)
server_layout.addWidget(self.server_button)
# URL layout
url_font = QtGui.QFont()
@ -120,7 +112,7 @@ class ServerStatus(QtWidgets.QWidget):
# Add the widgets
layout = QtWidgets.QVBoxLayout()
layout.addLayout(server_layout)
layout.addWidget(self.server_button)
layout.addLayout(url_layout)
layout.addWidget(self.server_shutdown_timeout_container)
self.setLayout(layout)
@ -155,14 +147,6 @@ class ServerStatus(QtWidgets.QWidget):
"""
Update the GUI elements based on the current state.
"""
# Set the status image
if self.status == self.STATUS_STOPPED:
self.status_image_label.setPixmap(QtGui.QPixmap.fromImage(self.status_image_stopped))
elif self.status == self.STATUS_WORKING:
self.status_image_label.setPixmap(QtGui.QPixmap.fromImage(self.status_image_working))
elif self.status == self.STATUS_STARTED:
self.status_image_label.setPixmap(QtGui.QPixmap.fromImage(self.status_image_started))
# Set the URL fields
if self.status == self.STATUS_STARTED:
self.url_description.show()