Compare commits

..

No commits in common. "master" and "0.9.77" have entirely different histories.

7 changed files with 27 additions and 43 deletions

View File

@ -124,7 +124,6 @@ case "$LANG" in
RESETCOLORS="Przywróć domyślne kolory"
AREYOUSURE="Czy aby napewno?"
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
_LEFTSIDEPANEL="Lewy panel boczny"
;;
*)
COLORIZECONKY="Conky Manager"
@ -182,7 +181,6 @@ case "$LANG" in
RESETCOLORS="Restore default colors"
AREYOUSURE="Are you sure?"
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
_LEFTSIDEPANEL="Left Sidepanel"
;;
esac
@ -479,7 +477,6 @@ if [[ "$1" == "-s" ]]; then
out+=("^sep()")
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
if [[ "$colorizer_size" == "full" ]];then
eval $(xdotool getdisplaygeometry --shell)

View File

@ -1,7 +1,7 @@
#!/bin/bash
#
# colorizer - set of tools for Mabox (auto)theming
# Copyright (C) 2022-2024 Daniel Napora <napcok@gmail.com>
# Copyright (C) 2022-2023 Daniel Napora <napcok@gmail.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -70,7 +70,6 @@ case "$LANG" in
_USE="Użyj czcionki"
_FOR="dla..."
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
_LEFTSIDEPANEL="Lewy panel boczny"
;;
*)
_INCREASE_ALL="Increase all"
@ -108,7 +107,6 @@ case "$LANG" in
_USE="Use"
_FOR="font for ..."
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
_LEFTSIDEPANEL="Left Sidepanel"
;;
esac
@ -352,7 +350,6 @@ if [[ "$1" == "-s" ]]; then
out+=("^sep()")
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
if [[ "$colorizer_size" == "full" ]];then
eval $(xdotool getdisplaygeometry --shell)
@ -375,7 +372,7 @@ if [[ "$1" == "-s" ]]; then
MENU_PADDING_TOP=$((jgtools_padding + 150))
#WALLPAPER
read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
THUMBDIR="$HOME/.cache/colorizer/thumbs"
mkdir -p ${THUMBDIR}
NAME=${WALLPATH////_}

View File

@ -147,7 +147,6 @@ case "$LANG" in
FILE="plik"
SET_RANDOM="Ustaw losowy motyw menu"
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
_LEFTSIDEPANEL="Lewy panel boczny"
;;
*)
MENU_THEME="Menu theme"
@ -232,7 +231,6 @@ case "$LANG" in
FILE="file"
SET_RANDOM="Set random menu theme"
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
_LEFTSIDEPANEL="Left Sidepanel"
;;
esac
@ -575,7 +573,6 @@ if [[ "$1" == "-s" ]]; then
out+=("^sep()")
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
if [[ "$colorizer_size" == "full" ]];then
eval $(xdotool getdisplaygeometry --shell)

View File

@ -140,7 +140,6 @@ case "$LANG" in
UNLOCK="odblokuj swoją kreatywność..."
SWITCH_TO_MBCOLORS="Przełącz na <b>MBColors</b>"
_COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
_LEFTSIDEPANEL="Lewy panel boczny"
;;
*)
QUICK_TWEAKS="Global Settings/Quick Tweaks"
@ -226,7 +225,6 @@ case "$LANG" in
UNLOCK="Unlock your creativity..."
SWITCH_TO_MBCOLORS="Switch to <b>MBColors</b>"
_COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
_LEFTSIDEPANEL="Left Sidepanel"
;;
esac
@ -669,7 +667,6 @@ source $HOME/.config/colorizer/colorizer.conf
out+=("^sep()")
out+=(" ${arrow_string_left} $_COLORIZER_ROOT,colorizer -s")
out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places")
if [[ "$colorizer_size" == "full" ]];then

View File

@ -817,10 +817,9 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
fi
if [[ "$FONT" != "" ]];then
if [[ "$1" != *"logo_mbcolor"* ]]; then
if [[ "$1" != *"quoter_mbcolor"* ]]; then
out+=("<big>󰛖</big> $FONTS [ <b><span font_family=\"${FONT}\">$FONT</span> $FONTSIZE</b> ],^checkout(fontsingle)")
out2+=("^tag(fontsingle)")
out2+=("^sep($FONTS)")
@ -854,7 +853,7 @@ if [[ "$FONT" != "" ]];then
fi
[[ "$SHADOWS" == "shadow" ]] && out+=("<big>󰄲</big> $SHADOW,conkyctl shades no ${1};$me") || out+=("<big>󰄱</big> $SHADOW,conkyctl shades shadow ${1};$me")
[[ "$SHADOWS" == "outline" ]] && out+=("<big>󰄲</big> $OLINE,conkyctl shades no ${1};$me") || out+=("<big>󰄱</big> $OLINE,conkyctl shades outline ${1};$me")
#out+=("^sep()")
out+=("^sep()")
fi
[[ "$BORD" == false ]] && out+=("<big>󰄱</big> $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)") || out+=("<big>󰄲</big> $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)")
@ -869,7 +868,6 @@ if [[ "$FONT" != "" ]];then
out2+=("2,conkyctl stippled_borders 2 ${1};$me")
out2+=("3,conkyctl stippled_borders 3 ${1};$me")
out2+=("4,conkyctl stippled_borders 4 ${1};$me")
fi
fi #OLD SYNTAX CHECK
out+=("^sep()")
out+=(" $EDIT ${title^},xdg-open ${1}")
@ -1022,9 +1020,7 @@ cmdmenu () {
label=${line%,*}
done <<< $(grep -v '^\s*$\|^#\|^\s*#' ${CONKYDIR}/menuscripts/${name}.csv)
#notify-send.sh "${label}" "${cmd[@]}"
sleep .1
${cmd[@]}
exit 0
else
# more than 1 lines - show menu
CUSTOMCOMMANDS=". ${CONKYDIR}/menuscripts/${name}.csv"
@ -1035,7 +1031,7 @@ cmdmenu () {
# otherwise build and show standalone menu with custom commands
sleep .1
sleep .2
read WINTRANS <<< "$(grep own_window_transparent ${CONKYCFG} | cut -d'=' -f2 | cut -d"," -f1)"
read FONTDEF <<< "$(grep "font .*=.*,$" ${CONKYCFG} | cut -d'=' -f2,3 |cut -d"'" -f2)"
FONT=${FONTDEF%:*}
@ -1382,7 +1378,7 @@ case "$1" in
toggleone) toggleone "$2";;
restartone) restartone "$2";;
contextmenu) contextmenu;;
cmdmenu) cmdmenu "$2";;
cmdmenu) cmdmenu;;
cmdmenu_edit) cmdmenu_edit "$2";;
makemoveableall) makemoveableall;;
saveposall) saveposall;;

View File

@ -135,7 +135,7 @@ h5 {font-size: 2vw !important;border-bottom: 1px solid;padding-left: 1em;}
</nav>
<div class="fixeddown">
<div class="center small" style="margin: 0 4px 4px 2px;">
<p><a class="tag small indigo" href="run://jgwallpaperchanger -s"> Wallpaper...</a> <a class="tag small indigo" href="run://mbwallpaper -o"></a></p>
<p><a class="tag small indigo" href="run://pcmanwp"> Wallpaper...</a> <a class="tag small indigo" href="run://mbwallpaper -o"></a></p>
<p><em>dynamic menus:</em></p>
<p>
<a class="tag small purple" href="run://colorizer -s"> Colorizer</a><br />

View File

@ -136,7 +136,7 @@ h5 {font-size: 2vw !important;border-bottom: 1px solid;padding-left: 1em;}
</nav>
<div class="fixeddown">
<div class="center small" style="margin: 0 4px 4px 2px;">
<p><a class="tag small indigo" href="run://jgwallpaperchanger -s"> Wybierz tapetę</a> <a class="tag small indigo" href="run://mbwallpaper -o"></a></p>
<p><a class="tag small indigo" href="run://pcmanwp"> Wybierz tapetę</a> <a class="tag small indigo" href="run://mbwallpaper -o"></a></p>
<p><em>dynamiczne menu</em></p>
<p>
<a class="tag small purple" href="run://colorizer -s"> Colorizer</a><br />