Get rid of qtmodern library

NanoVNASaver/Analysis.py

@@ -352,7 +352,7 @@ class BandPassAnalysis(Analysis):
         self.lower_sixty_db_label = QtWidgets.QLabel()
         self.lower_db_per_octave_label = QtWidgets.QLabel()
         self.lower_db_per_decade_label = QtWidgets.QLabel()
-        
+
         self.upper_cutoff_label = QtWidgets.QLabel()
         self.upper_six_db_label = QtWidgets.QLabel()
         self.upper_sixty_db_label = QtWidgets.QLabel()

NanoVNASaver/NanoVNASaver.py

@@ -44,8 +44,9 @@ from PyQt5.QtWidgets import QApplication, QPushButton, QDesktopWidget
 #
 ##*****************************************************
 import os
-import qtmodern.styles
-import qtmodern.windows
+# import qtmodern.styles
+# import qtmodern.windows
+from .skins import Skins
 app = QtWidgets.QApplication(sys.argv)
 ##*****************************************************
 ##*****************************************************
@@ -1403,7 +1404,7 @@ class DisplaySettingsWindow(QtWidgets.QWidget):
         self.app.settings.setValue("DarkMode", state)
         path = os.path.dirname(os.path.abspath(__file__))
         if state:
-            qtmodern.styles.dark(app)
+            Skins.dark(app)
             if self.color_mode_option.isChecked():
                 app.setStyleSheet( "file:///" + os.path.join(path, 'dark-colored.css'))
             else:
@@ -1413,7 +1414,7 @@ class DisplaySettingsWindow(QtWidgets.QWidget):
                 c.setForegroundColor(QtGui.QColor(QtCore.Qt.lightGray))
                 c.setTextColor(QtGui.QColor(QtCore.Qt.white))
         else:
-            qtmodern.styles.light(app)
+            Skins.light(app)
             if self.color_mode_option.isChecked():
                 app.setStyleSheet( "file:///" + os.path.join(path, 'light-colored.css'))
             else:

NanoVNASaver/__main__.py

@@ -29,8 +29,8 @@ from .about import debug
 #
 ##*****************************************************
 import os
-import qtmodern.styles
-import qtmodern.windows
+# import qtmodern.styles
+from .skins import Skins
 ##*****************************************************
 ##*****************************************************
 def main():
@@ -86,7 +86,7 @@ def main():
     #
     ##*****************************************************
     path = os.path.dirname(os.path.abspath(__file__))
-    qtmodern.styles.light(app)
+    Skins.light(app)
     # app.setStyleSheet( "file:///" + os.path.join(path, 'light-colored.css'))
     window = NanoVNASaver()
     window.show()

Pipfile

@@ -9,7 +9,6 @@ verify_ssl = true
 pyserial = "*"
 pyqt5 = "*"
 numpy = "*"
-qtmodern = { git = 'https://github.com/gmarull/qtmodern.git', ref = '0.1.4', editable = false }
 
 [requires]
 python_version = "3.7"