Merge pull request #10 from Satanarious/TFsV2.0+

TFsV2.0 Support

Data/defaults.py

@@ -14,6 +14,7 @@ class Key:
     focusing: str = "Focusing"
     hot: str = "Hot"
     separator: str = "Separator"
+    tooltip: str = "Tooltip"
     effectType: str = "Effect Type"
     cornerType: str = "Corner Type"
     enableDropShadow: str = "Enable Drop Shadow"
@@ -27,6 +28,9 @@ class Key:
     enableImmersiveStyle: str = "Enable Immersive Style"
     enableCustomRendering: str = "Enable Custom Rendering"
     enableFluentAnimation: str = "Enable Fluent Animation"
+    noModernAppBackgroundColor: str = "No Modern App Background Color"
+    colorTreatAsTransparent: str = "Color Treat As Transparent"
+    colorTreatAsTransparentThreshold: str = "Color Treat As Transparent Threshold"
     fadeOutTime: str = "Fade Out Time"
     popInTime: str = "Pop In Time"
     fadeInTime: str = "Fade In Time"
@@ -71,6 +75,9 @@ class Menu:
         enableImmersiveStyle: int = rawDefaults[Key.menu][Key.enableImmersiveStyle]
         enableCustomRendering: int = rawDefaults[Key.menu][Key.enableCustomRendering]
         enableFluentAnimation: int = rawDefaults[Key.menu][Key.enableFluentAnimation]
+        noModernAppBackgroundColor: int = rawDefaults[Key.menu][Key.noModernAppBackgroundColor]
+        colorTreatAsTransparent: str = rawDefaults[Key.menu][Key.colorTreatAsTransparent]
+        colorTreatAsTransparentThreshold: int = rawDefaults[Key.menu][Key.colorTreatAsTransparentThreshold]
         effectType: int = rawDefaults[Key.menu][Key.effectType]
         cornerType: int = rawDefaults[Key.menu][Key.cornerType]
         enableDropShadow: int = rawDefaults[Key.menu][Key.enableDropShadow]
@@ -119,3 +126,15 @@ class Separator:
             lightModeColor: str = rawDefaults[Key.menu][Key.separator][Key.lightModeColor]
             enableThemeColorization: int = rawDefaults[Key.menu][Key.separator][Key.enableThemeColorization]
             disabled: int = rawDefaults[Key.menu][Key.separator][Key.disabled]
+
+    class Tooltip:
+        effectType: int = rawDefaults[Key.tooltip][Key.effectType]
+        cornerType: int = rawDefaults[Key.tooltip][Key.cornerType]
+        enableDropShadow: int = rawDefaults[Key.tooltip][Key.enableDropShadow]
+        noBorderColor: int = rawDefaults[Key.tooltip][Key.noBorderColor]
+        enableThemeColorization: int = rawDefaults[Key.tooltip][Key.enableThemeColorization]
+        darkModeBorderColor: str = rawDefaults[Key.tooltip][Key.darkModeBorderColor]
+        lightModeBorderColor: str = rawDefaults[Key.tooltip][Key.lightModeBorderColor]
+        darkModeGradientColor: str = rawDefaults[Key.tooltip][Key.darkModeGradientColor]
+        lightModeGradientColor: str = rawDefaults[Key.tooltip][Key.lightModeGradientColor]
+        disabled: int = rawDefaults[Key.tooltip][Key.disabled]

Data/enums.py

@@ -41,6 +41,10 @@ class EnableFluentAnimation(IntEnum):
         No = 0
         Yes = 1
 
+    class NoModernAppBackgroundColor(IntEnum):
+        No = 0
+        Yes = 1
+
     class EnableCustomRendering(IntEnum):
         No = 0
         Yes = 1

Data/paths.py

@@ -18,6 +18,7 @@ class RegPaths:
         DisabledHot: str = r"DisabledHot\\"
         Focusing: str = r"Focusing\\"
         Separator: str = r"Separator\\"
+        Tooltip: str = r"Tooltip\\"
 
     class RegKeys:
         BaseKey: int = HKEY_CURRENT_USER
@@ -29,6 +30,7 @@ class RegKeys:
         DisabledHot: str = "DisabledHot"
         Focusing: str = "Focusing"
         Separator: str = "Separator"
+        Tooltip: str = "Tooltip"
         EffectType: str = "EffectType"
         EnableDropShadow: str = "EnableDropShadow"
         DarkModeBorderColor: str = "DarkMode_BorderColor"
@@ -42,6 +44,9 @@ class RegKeys:
         EnableImmersiveStyle: str = "EnableImmersiveStyle"
         EnableCustomRendering: str = "EnableCustomRendering"
         EnableFluentAnimation: str = "EnableFluentAnimation"
+        NoModernAppBackgroundColor: str = "NoModernAppBackgroundColor"
+        ColorTreatAsTransparent: str = "ColorTreatAsTransparent"
+        ColorTreatAsTransparentThreshold: str = "ColorTreatAsTransparentThreshold"
         FadeOutTime: str = "FadeOutTime"
         PopInTime: str = "PopInTime"
         FadeInTime: str = "FadeInTime"

Data/stylesheet.py

@@ -18,14 +18,9 @@ def frame():
         return "QWidget#scrollAreaWidgetContents{background-color:white;}"
 
     @staticmethod
-    def buttonColorStylesheet(rgba: tuple | str) -> str:
-        if type(rgba) == str:
-            return "QPushButton{background-color:" + rgba + ";width:20px}"
-        elif type(rgba) == tuple:
-            colorString: str = f"rgb({rgba[0]},{rgba[1]},{rgba[2]})"
-            return "QPushButton{background-color:" + colorString + ";width:20px}"
-        else:
-            return ""
+    def buttonColorStylesheet(rgba: tuple) -> str:
+        colorString: str = f"rgb({rgba[0]},{rgba[1]},{rgba[2]})"
+        return "QPushButton{background-color:" + colorString + ";width:20px}"
 
     @staticmethod
     def buttoResetStyleSheet() -> str: