diff --git a/NanoVNASaver/NanoVNASaver.py b/NanoVNASaver/NanoVNASaver.py index 420e9d3..dcaa586 100644 --- a/NanoVNASaver/NanoVNASaver.py +++ b/NanoVNASaver/NanoVNASaver.py @@ -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") diff --git a/NanoVNASaver/skins_utils.py b/NanoVNASaver/skins_utils.py index 6a2b843..fab853b 100644 --- a/NanoVNASaver/skins_utils.py +++ b/NanoVNASaver/skins_utils.py @@ -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)