Final touchup and code cleanup.

It's late, will go to sleep ;-)
pull/34/head
Carl Tremblay 2019-10-10 00:51:54 -04:00
rodzic bf1a100928
commit 67757a217c
2 zmienionych plików z 3 dodań i 6 usunięć

Wyświetl plik

@ -1135,7 +1135,7 @@ class DisplaySettingsWindow(QtWidgets.QWidget):
self.skin_dropdown = QtWidgets.QComboBox()
self.skin_dropdown.addItems([DARK_SKIN_STRING_COLORED, DARK_SKIN_STRING_MONOCHROME, LIGHT_SKIN_STRING_COLORED, LIGHT_SKIN_STRING_MONOCHROME])
self.skin_dropdown.addItems(NanoVNA_UI.getSkins())
self.skin_dropdown.setDisabled(True)
self.skin_dropdown.currentTextChanged.connect(self.changeSkins)
skin_dropdown_label = QtWidgets.QLabel("Choose skin to display")

Wyświetl plik

@ -46,11 +46,6 @@ def LIGHT_SKIN_COLORED():
else:
return sys._MEIPASS + '/skins/light-colored.css'
# DARK_SKIN_MONOCHROME = DARK_SKIN_MONOCHROME()
# DARK_SKIN_COLORED = DARK_SKIN_COLORED()
# LIGHT_SKIN_MONOCHROME = LIGHT_SKIN_MONOCHROME()
# LIGHT_SKIN_COLORED = LIGHT_SKIN_COLORED()
DARK_SKIN_STRING_COLORED = "Dark Colored"
DARK_SKIN_STRING_MONOCHROME = "Dark"
LIGHT_SKIN_STRING_COLORED = "Light Colored"
@ -58,6 +53,8 @@ LIGHT_SKIN_STRING_MONOCHROME = "Light"
class NanoVNA_UI:
def getSkins():
return [DARK_SKIN_STRING_COLORED, DARK_SKIN_STRING_MONOCHROME, LIGHT_SKIN_STRING_COLORED, LIGHT_SKIN_STRING_MONOCHROME]
def updateUI(self, skin, app):
current_skin = self.skin_dropdown.currentText()
logger.debug("Current Skin is: " + current_skin)