Merge pull request #57 from heyzec/master

 Added custom background feature as per #56

matter.py

@@ -313,12 +313,28 @@ def prepare_source_dir():
     highlight = parse_color(user_args.highlight)
     foreground = parse_color(user_args.foreground)
     background = parse_color(user_args.background)
+    image = user_args.image
     fontkey = user_args.font
     fontfile = user_args.fontfile
     fontname = user_args.fontname
     fontsize = user_args.fontsize
     icons = user_args.icons
 
+    # Image checks
+    if image:
+        if not exists(image):
+            error(
+                f"{image} does not exist!")
+        if os.path.splitext(image)[1] not in ('.png', '.tga', '.jpg', '.jpeg'):
+            error(
+                f"Background image must be one of .png, .tga, .jpg or .jpeg formats.")
+        image_name = basename(image)
+        copyfile(image, f"{INSTALLATION_SOURCE_DIR}/{image_name}")
+        if background:
+            warning(f"Both --background and --image arguments specified. Background color {background} will be ignored.")
+    else:
+        image_name = "background.png"
+
     # Icon checks
     # Read entries from grub.cfg
     with open(GRUB_CFG_PATH, "r", newline="") as f:
@@ -393,10 +409,14 @@ def prepare_source_dir():
         "highlight": highlight,
         "foreground": foreground,
         "background": background,
+        "image_name": image_name,
         "fontname": fontname,
     }
     parsed_theme = template.format(**context)
 
+    if image:
+        parsed_theme = parsed_theme.replace("# desktop-image", "desktop-image")
+
     theme_file_path = f"{INSTALLATION_SOURCE_DIR}/theme.txt"
     with open(theme_file_path, "w") as f:
         f.write(parsed_theme)
@@ -521,7 +541,7 @@ def do_install():
     do_set_icons()
     install_hookcheck()
     update_grub_cfg()
-    info(f"{THEME_NAME} succesfully installed")
+    info(f"{THEME_NAME} successfully installed")
 
 
 def do_uninstall():
@@ -713,6 +733,12 @@ def parse_args():
         help=f"solid background color",
         default=THEME_DEFAULT_BACKGROUND,
     )
+    parser.add_argument(
+        "--image",
+        "-im",
+        type=str,
+        help=f"image file to use as background",
+    )
     parser.add_argument(
         "--iconcolor",
         "-ic",

theme.txt.template

@@ -9,7 +9,7 @@
 
 # Global Property
 title-text: ""
-# desktop-image: "background.png"
+# desktop-image: "{image_name}"
 desktop-color: "{background}"
 terminal-font: "default" # a random name to let the default font for the console
 terminal-box: "terminal_box_*.png"