diff --git a/bin/mbxcolors b/bin/mbxcolors index 6119866..28c71cf 100755 --- a/bin/mbxcolors +++ b/bin/mbxcolors @@ -1,11 +1,12 @@ #!/usr/bin/env bash -# Copyright (C) Daniel Napora 2021 +# Copyright (C) Daniel Napora 2021-22 # Dependencies: jgmenu, xdotool, xcolor, gcolor3, xdg-utils, xclip, notify-send # TODO Imagick colors - separate menu big around 700 named colors # TODO export to .gpl (GIMP,Inkscape) -# TODO immadietely copy to clipboard picked,selected colors +# TODO Current Wallpaper palette +# TODO PL translation -VERSION="0.2.4" +VERSION="0.2.6" TEMP_DIR=/tmp/colormenu ME=${0##*/} @@ -74,27 +75,6 @@ pickcolor() { $ME } -## pycolor pick color by pyqt color dialog - not used yet -pycolor() { - read -r -d '' script <<-"----EOF" -import sys -from PyQt5.QtWidgets import QApplication, QMainWindow, QColorDialog - -class App(QMainWindow): - def __init__(self): - super().__init__() - color = QColorDialog.getColor() - if color.isValid(): - print(color.name()) - self.deleteLater() - -if __name__ == "__main__": - app = QApplication(sys.argv) - win = App() -----EOF - python -c "$script" -} - addcolor() { color=$(gcolor3) if [ -n "${color}" ]; then @@ -184,24 +164,6 @@ palettes() { fi } -## not used anymore(?) -htmlcolors() { - out+=("HTML colors,^checkout(html)") - out2+=("^tag(html)") - out2+=("^sep(HTML colors)") - for i in white yellow orange pink red brown green cyan blue purple gray;do - out2+=(" ${i^} ...,^checkout($i)") - out3+=("^tag($i)") - out3+=("^sep(${i^} colors)") - while read -r color name; - do - name=$(printf "%22s %s\n" "$name") - fg=$(fgcolor $color) - out3+=(" $color$name,$ME getcolorcode '$color',,,#$i") - done < "$CNF_DIR/$i.clr" - done -} - if [ $htmlcolors = "yes" ] && [ $expose != "html" ]; then htmlroot="^sep() HTML colors,^checkout(html) @@ -398,7 +360,8 @@ fi out1+=("^sep(Settings)") out1+=("Preferences,^pipe($ME preferences)") - +out1+=("^sep()") +out1+=("QUIT,^quit()") cat << EOF > ${MENU_ITEMS} $(printf '%s\n' "${out[@]}") diff --git a/share/mbxcolors/palettes/mint.clr b/share/mbxcolors/palettes/mint.clr new file mode 100644 index 0000000..5335029 --- /dev/null +++ b/share/mbxcolors/palettes/mint.clr @@ -0,0 +1,11 @@ +#94b273 +#6cabcd +#5b73c4 +#aa876a +#9d9d9d +#db9d61 +#c76199 +#8c6ec9 +#c15b58 +#c8ac69 +#5aaa9a diff --git a/share/mbxcolors/palettes/plasma_KDE_accents.clr b/share/mbxcolors/palettes/plasma_KDE_accents.clr new file mode 100644 index 0000000..db8705a --- /dev/null +++ b/share/mbxcolors/palettes/plasma_KDE_accents.clr @@ -0,0 +1,10 @@ +#e93a9a +#e93d58 +#e9643a +#e8cb2d +#3dd425 +#00d3b8 +#3daee9 +#b875dc +#926ee4 +#686b6f diff --git a/share/mbxcolors/palettes/yaru_accents.clr b/share/mbxcolors/palettes/yaru_accents.clr new file mode 100644 index 0000000..ea3e8a5 --- /dev/null +++ b/share/mbxcolors/palettes/yaru_accents.clr @@ -0,0 +1,8 @@ +#E95420 +#18b0b0 +#3584e4 +#0e8420 +#c748ba +#77216f +#c7162b +#f4a100