From 8a6c11b6b50c4fc0ecbadf462e55ef4373640597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=84min=20Baumeler?= Date: Wed, 18 Jun 2025 16:45:25 +0200 Subject: [PATCH] improvement: allow change of style through config file --- src/main.sh | 6 +++--- src/sh/theme.sh | 36 ++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main.sh b/src/main.sh index c389f14..e6f7dd0 100755 --- a/src/main.sh +++ b/src/main.sh @@ -32,6 +32,9 @@ EOF exit fi +# Configuration +. "sh/config.sh" + # Theme . "sh/theme.sh" @@ -50,9 +53,6 @@ fi # Reloading command-line options . "sh/clireload.sh" -# Configuration -. "sh/config.sh" - # Access to awk scripts . "sh/awkscripts.sh" diff --git a/src/sh/theme.sh b/src/sh/theme.sh index b0cb784..522383b 100644 --- a/src/sh/theme.sh +++ b/src/sh/theme.sh @@ -14,29 +14,29 @@ OFF="\033[m" # Style # Calendar -export STYLE_CALENDAR_MONTH="$GREEN" -export STYLE_CALENDAR_WEEKDAYS="$FAINT" -export STYLE_CALENDAR_CURRENT_DAY="$BLACK$BG" -export STYLE_CALENDAR_HL_DAY="$BOLD$RED" +export STYLE_CALENDAR_MONTH="${STYLE_CALENDAR_MONTH:-$GREEN}" +export STYLE_CALENDAR_WEEKDAYS="${STYLE_CALENDAR_WEEKDAYS:-$FAINT}" +export STYLE_CALENDAR_CURRENT_DAY="${STYLE_CALENDAR_CURRENT_DAY:-$BLACK$BG}" +export STYLE_CALENDAR_HL_DAY="${STYLE_CALENDAR_HL_DAY:-$BOLD$RED}" # Week view -export STYLE_WV_DAY="$GREEN" -export STYLE_WV_EVENT_DELIM="$RED / $OFF" -export STYLE_WV_SUMMARY="$CYAN" -export STYLE_WV_TIME="$WHITE" +export STYLE_WV_DAY="${STYLE_WV_DAY:-$GREEN}" +export STYLE_WV_EVENT_DELIM="${STYLE_WV_EVENT_DELIM:-$RED / $OFF}" +export STYLE_WV_SUMMARY="${STYLE_WV_SUMMARY:-$CYAN}" +export STYLE_WV_TIME="${STYLE_WV_TIME:-$WHITE}" # List view -export STYLE_LV="$FAINT" +export STYLE_LV="${STYLE_LV:-$FAINT}" # Day view -export STYLE_DV_ALLDAY="$LIGHT_CYAN$ITALIC$FAINT (allday) $OFF" -export STYLE_DV_TIME="$LIGHT_CYAN" -export STYLE_DV_CONFIRMED="$CYAN" -export STYLE_DV_TENTATIVE="$FAINT$CYAN" -export STYLE_DV_CANCELLED="$STRIKE$CYAN" -export STYLE_DV_HOUR="$FAINT" -export STYLE_DV_EMPTYHOUR="$FAINT----------------------$OFF" +export STYLE_DV_ALLDAY="${STYLE_DV_ALLDAY:-$LIGHT_CYAN$ITALIC$FAINT (allday) $OFF}" +export STYLE_DV_TIME="${STYLE_DV_TIME:-$LIGHT_CYAN}" +export STYLE_DV_CONFIRMED="${STYLE_DV_CONFIRMED:-$CYAN}" +export STYLE_DV_TENTATIVE="${STYLE_DV_TENTATIVE:-$FAINT$CYAN}" +export STYLE_DV_CANCELLED="${STYLE_DV_CANCELLED:-$STRIKE$CYAN}" +export STYLE_DV_HOUR="${STYLE_DV_HOUR:-$FAINT}" +export STYLE_DV_EMPTYHOUR="${STYLE_DV_EMPTYHOUR:-$FAINT----------------------$OFF}" # Event preview -export STYLE_EPV_DATETIME="$CYAN" -export STYLE_EPV_LOCATION="$GREEN" +export STYLE_EPV_DATETIME="${STYLE_EPV_DATETIME:-$CYAN}" +export STYLE_EPV_LOCATION="${STYLE_EPV_LOCATION:-$GREEN}"