small improvements

This commit is contained in:
Daniel Napora 2023-09-25 13:37:33 +02:00
parent 05a80516b6
commit dfc7192e8a
3 changed files with 36 additions and 15 deletions

View File

@ -293,14 +293,6 @@ mint+=("#6cabcd" "#5b73c4" "#aa876a" "#9d9d9d" "#db9d61" "#c76199" "#8c6ec9" "#c
out+=("^sep(Mabox Colorizer)")
out+=(" $SETTINGS,^checkout(settings)")
LNG=${LANG:0:2}
if [[ -f "/usr/share/mabox-colorizer/help/$LNG.html" ]];then
out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Colorizer'")
else
out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Colorizer'")
fi
out+=("^sep()")
out+=(" $COLORIZE,^pipe(randomizer c)")
out+=("^sep($MODULES)")
out+=("<big></big> $FONTS,colorizer-fonts -s")
@ -523,6 +515,8 @@ out2+=("<tt><small>$i</small> <span bgcolor='$i'> </span></tt>,w2the
fi
done
### TODO Rework below as submenu(edit palette and present palette with HTML helper- to keep it on desktop, allowing to copy colors from it)
##out+=("^sep()")
@ -548,6 +542,15 @@ if [[ "$gradient_obtheme" == "yes" || "$gradient_menu" == "yes" ]];then
out+=("<tt><span bgcolor='#16a084'> </span><span bgcolor='#43a480'> </span><span bgcolor='#5da97b'> </span><span bgcolor='#72ad77'> </span><span bgcolor='#84b171'> </span><span bgcolor='#95b66c'> </span><span bgcolor='#a5ba66'> </span><span bgcolor='#b5be61'> </span><span bgcolor='#c3c15a'> </span><span bgcolor='#d1c753'> </span><span bgcolor='#dfc94c'> </span><span bgcolor='#edce44'> </span><span bgcolor='#f4d03f'> </span></tt> $PRE_GRADIENTS,^pipe(mbgrad)")
fi
out+=("^sep($SETTINGS)")
out+=(" $SETTINGS,^checkout(settings)")
LNG=${LANG:0:2}
if [[ -f "/usr/share/mabox-colorizer/help/$LNG.html" ]];then
out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Colorizer'")
else
out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Colorizer'")
fi
### RESET ACTIONS (replaced by Randomizer)
#out+=("^sep($RESET_COLORS)")
#out+=("$RESET_CHOOSE,^checkout(resetroot)")

View File

@ -74,6 +74,7 @@ case "$LANG" in
GENERATEFROMWP="Generuj z kolorów tapety..."
LIGHTBG=" Jasne tło"
DARKBG="Ciemne tło"
RANDOMIZE="Generuj losowo"
TITLEBAR="Pasek tytułowy"
ACTIVE_WINDOW="Aktywne okno"
INACTIVE_WINDOW="Nieaktywne okno"
@ -156,6 +157,7 @@ case "$LANG" in
GENERATEFROMWP="Generate from wallpaper colors..."
LIGHTBG="Light Background"
DARKBG="Dark Background"
RANDOMIZE="Generate randomly"
TITLEBAR="Title Bar"
ACTIVE_WINDOW="Active Window"
INACTIVE_WINDOW="Inactive Window"
@ -333,6 +335,8 @@ out+=("<big></big> $QUICK_TWEAKS,^checkout(tweaks)")
out2+=("Normal,obtctl tweak normal;$me")
out2+=("Small,obtctl tweak small;$me")
out2+=("Tiny,obtctl tweak tiny;$me")
out2+=("^sep()")
out2+=("<big></big> $RANDOMIZE,obtctl randomizer;$me")
out2+=("\"\"\"^sep($RAISED_OR_FLAT?)\"\"\"")
[[ "$BEVEL" == "flat" ]] && out2+=("<big>綠</big> $FLAT,obtctl raised 0;$me") || out2+=("<big>祿</big> $FLAT,obtctl raised 0;$me")
[[ "$BEVEL" == "raised" ]] && out2+=("<big>綠</big> $RAISED,obtctl raised 1;$me") || out2+=("<big>祿</big> $RAISED,obtctl raised 1;$me")
@ -387,7 +391,8 @@ out+=("<big><span fgcolor='${ABGTO}'></span> <span fgcolor='${ABG}'></span
out2+=("^sep(<i>$GENERATEFROMWP</i>)")
out2+=("<big><span bgcolor='${w[-2]}' fgcolor='#222222'> <span bgcolor='${w[-4]}'> </span> $LIGHTBG <span bgcolor='${w[-4]}'> </span> </span></big>,w2theme ob light;$me")
out2+=("<big><span bgcolor='${w[2]}' fgcolor='#E5E5E5'> <span bgcolor='${w[4]}'> </span> $DARKBG <span bgcolor='${w[4]}'> </span> </span></big>,w2theme ob dark;$me")
out2+=("^sep()")
out2+=("<big></big> $RANDOMIZE,obtctl randomizer;$me")
out+=("^sep($TITLEBAR)")
out+=("<big>󰛖</big> $TITLEBAR_FONT [ <b> ${FNAME} ${FSIZE} </b> ],^checkout(titletext)")

View File

@ -562,19 +562,25 @@ randomizer () {
activegradient "$CLR" "$CLRTO"
### rand gradient type
TYPES=(solid vertical horizontal mirrorhorizontal diagonal pyramid)
TYPES=(solid vertical horizontal mirrorhorizontal diagonal mirrorhorizontal)
rand=$((RANDOM%6))
G_TYPE="${TYPES[$rand]}"
gradient_type "${G_TYPE}"
#rand
### Random border
BORDERS=(0 1 2 4)
rand=$((RANDOM%3))
BORDERS=(0 0 1 2 4)
rand=$((RANDOM%4))
BORDER="${BORDERS[$rand]}"
borderWidth "${BORDER}"
HANDLES=(0 0 2 4)
rand=$((RANDOM%4))
HANDLE="${HANDLES[$rand]}"
handlewidth "${HANDLE}"
### Random padding
PADDINGS=(2 4 8 12)
rand=$((RANDOM%4))
@ -583,8 +589,8 @@ randomizer () {
paddingHeight "${PADDING}"
### TITLEBAR STYLE
STYLES=(flat raised sunken)
rand=$((RANDOM%3))
STYLES=(flat raised raised sunken)
rand=$((RANDOM%4))
STYLE="${STYLES[$rand]}"
raised "${STYLE}"
@ -634,6 +640,13 @@ randomizer () {
buttons "${BUTTON}"
### Buttons layout
LAYOUTS=(NDSLIMC NDSLIMC NLIMC LIMC)
rand=$((RANDOM%4))
LAYOUT="${LAYOUTS[$rand]}"
ndslimc "${LAYOUT}"
#MSG="
#Openbox Window Decoration settings
@ -651,7 +664,7 @@ randomizer () {
#Font: <b>${FAMILY} ${WEIGHT} ${SLANT} ${FONTSIZE}</b>
#"
# notify-send.sh -R /tmp/randomizer_notify -t 10000 -i mbcc "Mabox Colorizer" "${MSG}" \
-o "Regenerate:randomizer ob" -o "Customize:colorizer-ob -s"
# -o "Regenerate:randomizer ob" -o "Customize:colorizer-ob -s"
}
tweak() {