diff --git a/bin/mbxcolors b/bin/mbxcolors
index 8d286e0..a1e5504 100755
--- a/bin/mbxcolors
+++ b/bin/mbxcolors
@@ -6,8 +6,7 @@
# TODO notifications when copying to clipboard (imagick needed to create icon)
# TODO check for other color-tools like gpick,gcolor2 and add launchers to menu
# TODO export to .gpl (GIMP,Inkscape)
-# TODO use xcolor as picker
-# TODO quicly remove colors from picked (with sed)
+# DONE quicly remove colors from picked (with sed)
ME=${0##*/}
@@ -59,7 +58,12 @@ hex2rgba() {
echo "rgba($r, $g, $b, 1.0)"
}
pickcolor() {
- color=$(colorpicker --short --one-shot --preview)
+ #color=$(colorpicker --short --one-shot --preview)
+ #color=$(xcolor --preview-size "${preview-size:-255}" --scale "${scale:-8}")
+ size=${xcolor_preview_size:-255}
+ scale=${xcolor_scale:-8}
+ command="xcolor --preview-size ${size} --scale ${scale}"
+ color="$(${command})"
echo "$color " > "$RECENT".tmp
# add on top deduplicate
awk '!x[$0]++' "$RECENT" >> "$RECENT".tmp
@@ -175,9 +179,9 @@ position() {
mkconfigfile() {
if [[ -f /usr/share/mbxtools/configure.inc ]];then
. /usr/share/mbxtools/configure.inc
-#elif [[ -f /usr/share/mb-jgtools/pipemenu-standalone.cfg ]];then
-#. /usr/share/mb-jgtools/pipemenu-standalone.cfg
-#. $HOME/.config/mabox/mabox.conf
+elif [[ -f /usr/share/mb-jgtools/pipemenu-standalone.cfg ]];then
+. /usr/share/mb-jgtools/pipemenu-standalone.cfg
+. $HOME/.config/mabox/mabox.conf
else
MENU_ITEMS=$(mktemp)
CONFIG_FILE=$(mktemp)
@@ -298,20 +302,28 @@ case "$expose" in
;;
picked|*)
out+=("^sep(Recently picked colors:)")
+ # for clear/delete
+ out2+=("^tag(pickeddel)")
+ out2+=("^sep(Clear All)")
+ out2+=("Clear all,echo > $RECENT;$ME")
+ out2+=("^sep(Just remove one color...)")
while read -r color name;do
# name=$(printf "%22s %s\n" "$name")
# fg=$(fgcolor $color)
# out+=(" $color$name,$ME getcolorcode '$color'")
out+=("$color ,$ME getcolorcode '$color'")
+ out2+=("$color ,sed -i '/${color:1:6}/d' $RECENT;$ME")
+ #echo "$color ,sed '/${color:1:6}/d' $RECENT;$ME"
done < <(grep ^# $RECENT)
-
-
-
+
out+=("^sep()")
out+=("New palette from recently picked,$ME recent2palette;$ME")
- out+=("Clear recently picked,echo > $RECENT;$ME")
+ #out+=("Clear recently picked,echo > $RECENT;$ME")
+ out+=("Clear recently picked,^checkout(pickeddel)")
+
+
;;
esac
@@ -350,7 +362,7 @@ out2+=("$(printf "%-20s %20s" "Built-in palettes:" "[$builtin_palettes$(printf "%-20s %20s" "Position:" "[$position]"),^checkout(position)")
out2+=("^sep()")
-out2+=("Reset to defaults,rm $CNF_FILE,$ME")
+out2+=("Reset to defaults,rm $CNF_FILE;$ME")
out2+=("^sep()")
out2+=("Edit config file,xdg-open $CNF_FILE")
out2+=("Open config directory,xdg-open $CNF_DIR")