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

Make a new onionshare_gui.GuiCommon object, and move css from onionshare.Common into it

Browse source
This commit is contained in:
Micah Lee 2019-10-20 20:01:09 -07:00
parent 4f2ce99417
commit bba5286815
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
10 changed files with 323 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

16
onionshare_gui/server_status.py
View file

@ -151,11 +151,13 @@ class ServerStatus(QtWidgets.QWidget):
self.url.setFont(url_font)
self.url.setWordWrap(True)
self.url.setMinimumSize(self.url.sizeHint())
self.url.setStyleSheet(self.common.css["server_status_url"])
self.url.setStyleSheet(self.common.gui.css["server_status_url"])
self.copy_url_button = QtWidgets.QPushButton(strings._("gui_copy_url"))
self.copy_url_button.setFlat(True)
self.copy_url_button.setStyleSheet(self.common.css["server_status_url_buttons"])
self.copy_url_button.setStyleSheet(
self.common.gui.css["server_status_url_buttons"]
)
self.copy_url_button.setMinimumHeight(65)
self.copy_url_button.clicked.connect(self.copy_url)
self.copy_hidservauth_button = QtWidgets.QPushButton(
@ -163,7 +165,7 @@ class ServerStatus(QtWidgets.QWidget):
)
self.copy_hidservauth_button.setFlat(True)
self.copy_hidservauth_button.setStyleSheet(
self.common.css["server_status_url_buttons"]
self.common.gui.css["server_status_url_buttons"]
)
self.copy_hidservauth_button.clicked.connect(self.copy_hidservauth)
url_buttons_layout = QtWidgets.QHBoxLayout()
@ -329,7 +331,7 @@ class ServerStatus(QtWidgets.QWidget):
if self.status == self.STATUS_STOPPED:
self.server_button.setStyleSheet(
self.common.css["server_status_button_stopped"]
self.common.gui.css["server_status_button_stopped"]
)
self.server_button.setEnabled(True)
if self.mode == ServerStatus.MODE_SHARE:
@ -345,7 +347,7 @@ class ServerStatus(QtWidgets.QWidget):
self.autostop_timer_container.show()
elif self.status == self.STATUS_STARTED:
self.server_button.setStyleSheet(
self.common.css["server_status_button_started"]
self.common.gui.css["server_status_button_started"]
)
self.server_button.setEnabled(True)
if self.mode == ServerStatus.MODE_SHARE:
@ -367,7 +369,7 @@ class ServerStatus(QtWidgets.QWidget):
)
elif self.status == self.STATUS_WORKING:
self.server_button.setStyleSheet(
self.common.css["server_status_button_working"]
self.common.gui.css["server_status_button_working"]
)
self.server_button.setEnabled(True)
if self.autostart_timer_datetime:
@ -385,7 +387,7 @@ class ServerStatus(QtWidgets.QWidget):
self.autostop_timer_container.hide()
else:
self.server_button.setStyleSheet(
self.common.css["server_status_button_working"]
self.common.gui.css["server_status_button_working"]
)
self.server_button.setEnabled(False)
self.server_button.setText(strings._("gui_please_wait"))