diff --git a/bin/TODOlist b/bin/TODOlist
index f6f670b..0a409bf 100755
--- a/bin/TODOlist
+++ b/bin/TODOlist
@@ -1,5 +1,8 @@
#!/bin/bash
+source /usr/share/mb-jgtools/jgtools.inc
+
+
me=${0##*/}
CONKYDIR="$HOME/.config/conky"
CFG_FILE=~/.config/mabox/mabox-todo.conf
@@ -192,9 +195,9 @@ if [ "${#files[@]}" -gt "1" ];then
prettyline=${line//_/ }
tasks=$(cat ~/.todo/${line}.txt |wc -l)
if [ "$line" = "${filename}" ];then
- out2+=("綠 ${prettyline} ($_TASKS ${tasks}) ,${0} center")
+ out2+=("${ron} ${prettyline} ($_TASKS ${tasks}) ,${0} center")
else
- out2+=("祿 ${prettyline} ($_TASKS ${tasks}) ,mabox-todo.sh s $line;${0} center")
+ out2+=("${roff} ${prettyline} ($_TASKS ${tasks}) ,mabox-todo.sh s $line;${0} center")
fi
done <<< $(mabox-todo.sh listfiles)
fi
@@ -251,7 +254,7 @@ else
out2+=("^sep($_FILTERBY)")
for proj in "${projects[@]}"
do
- [[ "$filter" == "$proj" ]] && out2+=("綠 ${proj} ,mb-setvar filter= ${CFG_FILE};${0} center") || out2+=("祿 ${proj} ,mb-setvar filter=${proj} ${CFG_FILE};${0} center")
+ [[ "$filter" == "$proj" ]] && out2+=("${ron} ${proj} ,mb-setvar filter= ${CFG_FILE};${0} center") || out2+=("${roff} ${proj} ,mb-setvar filter=${proj} ${CFG_FILE};${0} center")
done
fi
@@ -261,15 +264,15 @@ else
out2+=("^sep()")
for context in "${contexts[@]}"
do
- [[ "$filter" == "$context" ]] && out2+=("綠 ${context} ,mb-setvar filter= ${CFG_FILE};${0} center") || out2+=("祿 ${context} ,mb-setvar filter=${context} ${CFG_FILE};${0} center")
+ [[ "$filter" == "$context" ]] && out2+=("${ron} ${context} ,mb-setvar filter= ${CFG_FILE};${0} center") || out2+=("${roff} ${context} ,mb-setvar filter=${context} ${CFG_FILE};${0} center")
done
fi
out2+=("^sep($_SH_CONKY)")
-[[ "$hide_done" = "y" ]] && out2+=(" $_SH_DONE,mb-setvar hide_done=n ${CFG_FILE}; ${0} center") || out2+=(" $_SH_DONE,mb-setvar hide_done=y ${CFG_FILE}; ${0} center")
-[[ "$hide_priority" = "y" ]] && out2+=(" $_SH_PRIO,mb-setvar hide_priority=n ${CFG_FILE}; ${0} center") || out2+=(" $_SH_PRIO ,mb-setvar hide_priority=y ${CFG_FILE}; ${0} center")
-[[ "$hide_project" = "y" ]] && out2+=(" $_SH_PROJ,mb-setvar hide_project=n ${CFG_FILE}; ${0} center") || out2+=(" $_SH_PROJ,mb-setvar hide_project=y ${CFG_FILE}; ${0} center")
-[[ "$hide_context" = "y" ]] && out2+=(" $_SH_CONTEXT,mb-setvar hide_context=n ${CFG_FILE}; ${0} center") || out2+=(" $_SH_CONTEXT,mb-setvar hide_context=y ${CFG_FILE}; ${0} center")
+[[ "$hide_done" = "y" ]] && out2+=("${cboff} $_SH_DONE,mb-setvar hide_done=n ${CFG_FILE}; ${0} center") || out2+=("${cbon} $_SH_DONE,mb-setvar hide_done=y ${CFG_FILE}; ${0} center")
+[[ "$hide_priority" = "y" ]] && out2+=("${cboff} $_SH_PRIO,mb-setvar hide_priority=n ${CFG_FILE}; ${0} center") || out2+=("${cbon} $_SH_PRIO ,mb-setvar hide_priority=y ${CFG_FILE}; ${0} center")
+[[ "$hide_project" = "y" ]] && out2+=("${cboff} $_SH_PROJ,mb-setvar hide_project=n ${CFG_FILE}; ${0} center") || out2+=("${cbon} $_SH_PROJ,mb-setvar hide_project=y ${CFG_FILE}; ${0} center")
+[[ "$hide_context" = "y" ]] && out2+=("${cboff} $_SH_CONTEXT,mb-setvar hide_context=n ${CFG_FILE}; ${0} center") || out2+=("${cbon} $_SH_CONTEXT,mb-setvar hide_context=y ${CFG_FILE}; ${0} center")
else
out+=("$_START_CONKY,conkyctl startone ${HOME}/.config/conky/TODOlist_mbcolor.conkyrc;${0}")
@@ -292,8 +295,7 @@ fi
fi
-source /usr/share/mb-jgtools/pipemenu-standalone.cfg
-source "$HOME/.config/mabox/mabox.conf"
+
CONFIG_FILE=$(mktemp)
MENU_ITEMS=$(mktemp)
trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT