From bbeef1de92accbd7c73873a95cfeb02ffa7a3bf5 Mon Sep 17 00:00:00 2001
From: Mateo de Mayo <mateodemayo@gmail.com>
Date: Tue, 19 Jan 2021 19:13:55 -0300
Subject: [PATCH] Make it more explicit that matter is being executed on grub
 updates

---
 Matter/theme.txt      | 12 ++++++------
 hookcheck.py.template |  7 +++++--
 matter.py             |  9 +++++++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Matter/theme.txt b/Matter/theme.txt
index 2736126..50ec57d 100755
--- a/Matter/theme.txt
+++ b/Matter/theme.txt
@@ -11,7 +11,7 @@
 title-text: ""
 # desktop-image: "background.png"
 desktop-color: "#263238"
-terminal-font: "Unifont Regular 16"
+terminal-font: "default" # a random name to let the default font for the console
 terminal-box: "terminal_box_*.png"
 terminal-left: "0"
 terminal-top: "0"
@@ -25,9 +25,9 @@ terminal-border: "0"
   top = 29%
   width = 28%
   height = 60%
-  item_font = "GoogleSans Regular 32"
-  item_color = "#cccccc"
-  selected_item_color = "#E91E63"
+  item_font = "Google Sans Regular 32"
+  item_color = "#ffffff"
+  selected_item_color = "#e91e63"
   icon_width = 72
   icon_height = 72
   item_height = 72
@@ -43,6 +43,6 @@ terminal-border: "0"
   align = "center"
   id = "__timeout__"
   text = "Booting in %d seconds"
-  color = "#cccccc"
-  font = "GoogleSans Regular 32"
+  color = "#ffffff"
+  font = "Google Sans Regular 32"
 }
diff --git a/hookcheck.py.template b/hookcheck.py.template
index 9a288a6..0481d08 100644
--- a/hookcheck.py.template
+++ b/hookcheck.py.template
@@ -33,16 +33,19 @@ BEGIN_THEME_OVERRIDES = "{BEGIN_THEME_OVERRIDES}"
 END_THEME_OVERRIDES = "{END_THEME_OVERRIDES}"
 SETICONS_CALL = "{SETICONS_CALL}"
 
-
+cyan = "\033[36m"
+pink = "\033[38;5;206m"
+endcolor ="\033[0m"
 def info(msg):
     # info with cyan [I]
-    print(f"\033[36m[I]\033[0m {{msg}}", file=stderr)
+    print(f"{{cyan}}[I]{{endcolor}} {{msg}}", file=stderr)
 
 
 def sh(command):
     "Executes command in shell and returns its exit status"
     return run(command, shell=True).returncode
 
+info(f"{{pink}}[Matter]{{endcolor}} Setting entry icons")
 
 with open(GRUB_MKCONFIG_PATH, "r", newline="") as f:
     grub_mkconfig = f.read()
diff --git a/matter.py b/matter.py
index 4d60e99..7d4707d 100755
--- a/matter.py
+++ b/matter.py
@@ -26,6 +26,7 @@
 def color_string(string, fg=None):
     COLORS = {  # List some colors that may be needed
         "red": "\033[31m",
+        "pink": "\033[38;5;206m",
         "green": "\033[32m",
         "orange": "\033[33m",
         "blue": "\033[34m",
@@ -35,6 +36,8 @@ def color_string(string, fg=None):
         "yellow": "\033[93m",
         "lightblue": "\033[94m",
         "lightcyan": "\033[96m",
+        "brightwhite": "\u001b[37;1m",
+        "brightmagenta": "\u001b[35;1m",
     }
     endcolor = "\033[0m"
     return f"{COLORS.get(fg, '')}{string}{endcolor}"
@@ -478,8 +481,10 @@ def get_entry_names(grub_cfg):
 
 def do_preinstall_hint():
     info(
-        f"[{color_string(THEME_NAME.upper(), fg='pink')} "
-        f"{color_string('Grub Theme'.upper(), fg='orange')}]"
+        f"{color_string('[ ', fg='brightwhite')}"
+        f"{color_string(THEME_NAME, fg='brightmagenta')} "
+        f"{color_string('Grub Theme'.upper(), fg='lightcyan')}"
+        f"{color_string(' ]', fg='brightwhite')}"
     )
     info("Argument -i required. Which icons go to which grub entries?.")
     info("Your grub entries are:")