Move all resources (locale, images, html, version.txt) into central resources dir, and clean up logic to find absolute paths to resources

This commit is contained in:
Micah Lee 2016-04-12 15:14:02 -07:00
parent 7c18d77fb2
commit e81f809882
34 changed files with 59 additions and 137 deletions

View file

@ -22,8 +22,6 @@ from PyQt5 import QtCore, QtWidgets, QtGui
from onionshare import strings, helpers
from . import common
class ServerStatus(QtWidgets.QVBoxLayout):
"""
The server status chunk of the GUI.
@ -46,9 +44,9 @@ class ServerStatus(QtWidgets.QVBoxLayout):
self.file_selection = file_selection
# server layout
self.status_image_stopped = QtGui.QImage(common.get_image_path('server_stopped.png'))
self.status_image_working = QtGui.QImage(common.get_image_path('server_working.png'))
self.status_image_started = QtGui.QImage(common.get_image_path('server_started.png'))
self.status_image_stopped = QtGui.QImage(helpers.get_resource_path('images/server_stopped.png'))
self.status_image_working = QtGui.QImage(helpers.get_resource_path('images/server_working.png'))
self.status_image_started = QtGui.QImage(helpers.get_resource_path('images/server_started.png'))
self.status_image_label = QtWidgets.QLabel()
self.status_image_label.setFixedWidth(30)
self.server_button = QtWidgets.QPushButton()