Merge pull request #167 from luisbocanegra/konsole-auto-theme-profile

Author: luisbocanegra

src/kde_material_you_colors/apply_themes.py

@@ -51,15 +51,14 @@ def apply(config: Configs, wallpaper: WallpaperReader, dark_light):
     if config.read("titlebar_opacity"):
         titlebar_utils.titlebar_opacity(config.read("titlebar_opacity"))
         needs_kwin_reload = True
-    if config.read("konsole_profile"):
-        konsole_utils.make_mirror_profile(config.read("konsole_profile"))
-        konsole_utils.apply_color_scheme(
-            dark_light,
-            config.read("pywal_light"),
-            schemes,
-            config.read("konsole_profile"),
-            konsole_opacity=config.read("konsole_opacity"),
-        )
+    konsole_utils.export_scheme(
+        light=config.read("light"),
+        pywal_light=config.read("pywal_light"),
+        schemes=schemes,
+        konsole_opacity=config.read("konsole_opacity"),
+    )
+    if config.read("disable_konsole") is not True:
+        konsole_utils.apply_color_scheme()
     if config.read("darker_window_list"):
         titlebar_utils.kwin_rule_darker_titlebar(
             dark_light

src/kde_material_you_colors/config.py

@@ -93,7 +93,7 @@ def __init__(self, args):
             "dark_blend_multiplier": [args.dbmultiplier, 1, 2],
             "on_change_hook": [args.on_change_hook, None, 3],
             "sierra_breeze_buttons_color": [args.sierra_breeze_buttons_color, None, 0],
-            "konsole_profile": [args.konsole_profile, None, 3],
+            "disable_konsole": [args.disable_konsole, False, 0],
             "titlebar_opacity": [args.titlebar_opacity, None, 1],
             "toolbar_opacity": [args.toolbar_opacity, None, 1],
             "konsole_opacity": [args.konsole_opacity, None, 1],

src/kde_material_you_colors/data/sample_config.conf

@@ -54,7 +54,7 @@ ncolor = 0
 # Accepted values are True or False comment out to dark/light scheme
 # Commented by default (Follows light option above)
 # NOTE:
-# Theming konsole only doesn't require pywal, just setting konsole_profile below
+# Theming Konsole doesn't require pywal to be installed
 #pywal_light = False
 
 # The amount of perceptible color for backgrounds in dark mode
@@ -78,15 +78,11 @@ ncolor = 0
 # This WILL OVERWRITE any set colors and reload KWin (screen will blink on x11)
 #sierra_breeze_buttons_color = True
 
-# Dynamically updated Konsole color scheme
-# Accepted value is the name of your current Konsole profile, except TempMyou and Default profile as is read only
-# Default is commented (disabled)
+# Disable automatic Konsole theming
+# Default is False
 # NOTE:
-# This makes a temp profile named TempMyou.profile and MaterialYou/MaterialYouAlt color schemes to switch between them automatically in all open Konsole instances
-# You can make direct changes to your profile, but for the color scheme edit MaterialYou one
-# WARNING:
-# I recommend you to backup the ~/.local/share/konsole/ folder before trying this because it will edit your profiles
-#konsole_profile = Profile 1
+# When enabled, Konsole color scheme files are still generated, but not enforced
+#disable_konsole = False
 
 # Konsole background opacity
 # An integer between 0 and 100

src/kde_material_you_colors/main.py

@@ -175,12 +175,11 @@ def main():
     )
 
     parser.add_argument(
-        "--konsole-profile",
-        "-kp",
-        type=str,
-        help="The name of your (existing) Konsole profile that is going to be themed, you can check your current profiles with konsole --list-profiles",
+        "--disable-konsole",
+        "-dk",
+        action="store_true",
+        help="Disable Konsole automatic theming (color schemes are still generated)",
         default=None,
-        metavar="<profile>",
     )
 
     parser.add_argument(
@@ -316,12 +315,15 @@ def main():
 
     counter = 0
 
+    logging.debug(config.options)
+
     while True:
         config_modified.set_value(file_utils.get_file_sha1(config_file))
 
         # Get config from file and compare it with passed args
         if config_modified.changed:
             config = Configs(args)
+            logging.debug(config.options)
 
         # Get current options, pass to watcher
         config_watcher.set_value(config.options)

src/kde_material_you_colors/settings.py

@@ -42,6 +42,8 @@
 KONSOLE_COLOR_SCHEME_PATH = KONSOLE_DIR + "MaterialYou.colorscheme"
 KONSOLE_COLOR_SCHEME_ALT_PATH = KONSOLE_DIR + "MaterialYouAlt.colorscheme"
 KONSOLE_TEMP_PROFILE = KONSOLE_DIR + "TempMyou.profile"
+KONSOLE_DEFAULT_THEMED_PROFILE = "Profile 1"
+KONSOLE_RC = HOME + "/.config/konsolerc"
 KSYNTAX_THEMES_DIR = HOME + "/.local/share/org.kde.syntax-highlighting/themes/"
 LOG_FILE_PATH = HOME + "/.local/share/kde-material-you-colors/"
 LOG_FILE_NAME = "kde-material-you-colors.log"