From bdf65c06e0237424fccd9b0f6857282c3b967e97 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Thu, 21 Oct 2021 22:59:27 +0200 Subject: [PATCH] icon upd --- bin/mbx | 85 ++++-------------- share/icons/hicolor/48x48/apps/mbx-lpanel.png | Bin 717 -> 567 bytes share/icons/hicolor/48x48/apps/mbx-rpanel.png | Bin 710 -> 590 bytes .../hicolor/scalable/apps/mbx-lpanel.svg | 6 +- .../hicolor/scalable/apps/mbx-rpanel.svg | 8 +- 5 files changed, 24 insertions(+), 75 deletions(-) diff --git a/bin/mbx b/bin/mbx index 459d7e6..6cc2e4b 100755 --- a/bin/mbx +++ b/bin/mbx @@ -1,12 +1,10 @@ #!/bin/bash -# mbxutils: handy utilities for your X11 window manager. -# -# Copyright (C) 2021 Daniel Napora -# mbx +# mbxutils: handy utilities for your X11 window manager. +# Copyright (C) 2021 Daniel Napora +# # TODO Preferences standalone # TODO Logout Dialog postponed # TODO Filebrowser standalone postponed -# FIXME Remove devel-helpers - move them to another tool ME=$(basename "$0") @@ -29,54 +27,13 @@ fg(){ r=$(printf "%d" 0x${1:1:2}) g=$(printf "%d" 0x${1:3:2}) b=$(printf "%d" 0x${1:5:2}) rgb="$((r*299+g*587+b*114))" [ "$rgb" -gt 138000 ] && fgcolor="#222222" color_title_fg="#111111" color_sel_fg="#111111" color_sep_fg="#222222 20"|| fgcolor="#EEEEEE" color_title_fg="#FFFFFF" color_sel_fg="#FFFFFF" - [ "$rgb" -gt 200000 ] && color_sel_bg="#222222 8" color_sel_border="#222222 16" color_title_bg="#222222 8" -### [ "$((r*299+g*587+b*114))" -gt 149000 ] && echo "#111111" || echo "#EEEEEE" + [ "$rgb" -gt 200000 ] && color_sel_bg="#222222 8" color_sel_border="#222222 16" color_title_bg="#222222 8" } ###fgcolor=$(fg $bgcolor) fg "$bgcolor" #KOLOR FG -### DDEV ONLY -rgb() { - r=$(printf "%d" 0x${1:1:2}) g=$(printf "%d" 0x${1:3:2}) b=$(printf "%d" 0x${1:5:2}) - echo "rgb($r, $g, $b)" -} - -color=$(rgb $fgcolor) -background=$(rgb $bgcolor) -function luminance() -{ - R=$( echo $1 | awk -F, '{print substr($1,5)}' ) - G=$( echo $1 | awk -F, '{print $2}' ) - B=$( echo $1 | awk -F, '{n=length($3); print substr($3,1,n-1)}' ) - - echo "scale=4 -rsrgb=$R/255 -gsrgb=$G/255 -bsrgb=$B/255 -if ( rsrgb <= 0.03928 ) r = rsrgb/12.92 else r = e( 2.4 * l((rsrgb+0.055)/1.055) ) -if ( gsrgb <= 0.03928 ) g = gsrgb/12.92 else g = e( 2.4 * l((gsrgb+0.055)/1.055) ) -if ( bsrgb <= 0.03928 ) b = bsrgb/12.92 else b = e( 2.4 * l((bsrgb+0.055)/1.055) ) -0.2126 * r + 0.7152 * g + 0.0722 * b" | bc -l -} - -lum1=$( luminance $color ) -lum2=$( luminance $background ) - -# compute contrast - -function contrast() -{ - echo "scale=2 -if ( $1 > $2 ) { l1=$1; l2=$2 } else { l1=$2; l2=$1 } -(l1 + 0.05) / (l2 + 0.05)" | bc -} - -rel=$( contrast $lum1 $lum2 ) - - - configure() { if [ -f /usr/share/mbxutils/mbxutils.inc ];then . /usr/share/mbxutils/mbxutils.inc @@ -171,8 +128,6 @@ $APPS,^checkout(apps),applications-other ^sep() Logout dialog,mb-jgtools mblogout,system-shutdown Preferences,^pipe($ME preferences mmenu),firefox -^sep(rgb: $rgb) -^sep(rel: $rel) ^tag(apps) EOF else @@ -191,8 +146,6 @@ Preferences,^pipe($ME preferences mmenu),firefox About mbxutils,mbx ^sep() Logout dialog,mb-jgtools mblogout,system-shutdown -^sep(rgb: $rgb) -^sep(rel: $rel) EOF fi @@ -289,17 +242,15 @@ preferences() { PAR="${ME} $1" out+=("^sep(mbxutils Global Settings)") - out+=("^sep(rgb: $rgb)") - out+=("^sep(rel: $rel)") out+=("^sep(Appearance)") - out+=("$(printf "%-15s %20s" "Font:" "[$font]"),^pipe($ME fonts $1)") - out+=("$(printf "%-15s %20s" "Font size (px):" "[$font_size]"),^checkout(fontsize)") - out+=("$(printf "%-15s %20s" "Line height:" "[$item_height_factor%]"),^checkout(lineheight)") - out+=("$(printf "%-15s %20s" "BGcolor:" "[$bgcolor]"),^checkout(bgcolor)") + out+=("$(printf "%-15s %24s" "Font:" "[$font]"),^pipe($ME fonts $1)") + out+=("$(printf "%-15s %24s" "Font size (px):" "[$font_size]"),^checkout(fontsize)") + out+=("$(printf "%-15s %24s" "Line height:" "[$item_height_factor%]"),^checkout(lineheight)") + out+=("$(printf "%-15s %24s" "BGcolor:" "[$bgcolor]"),^checkout(bgcolor)") out+=("^sep(Other)") - out+=("$(printf "%-15s %20s" "Terminal:" "[$terminal]"),^checkout(terminal),terminal") - out+=("$(printf "%-15s %20s" "File Manager:" "[$filemanager]"),^checkout(filemanager)") + out+=("$(printf "%-15s %24s" "Terminal:" "[$terminal]"),^checkout(terminal),terminal") + out+=("$(printf "%-15s %24s" "File Manager:" "[$filemanager]"),^checkout(filemanager)") #out+=("$(printf "%-15s %20s" "Margin (px):" "[$margin_xy]"),^checkout(margin)") out+=("^sep()") out+=("Edit config file,xdg-open $CNF_FILE") @@ -331,7 +282,6 @@ preferences() { out2+=("$term,mbx setvar terminal=$term;$PAR fixed") done < "$terminals" - out2+=("^tag(filemanager)") out2+=("^sep(Select File Manager)") filemanagers="$CNF_DIR/inc/file_managers.inc" @@ -348,15 +298,15 @@ preferences() { printf '%s\n' "${out[@]}" printf '%s\n' "${out2[@]}" fi - } + fonts(){ - PAR="${ME} $1" -echo "^sep(Font)" -while read -r x -do -echo "$x,$ME setvar \"font=\'${x}\'\";$PAR fixed" -done < "$CNF_DIR"/inc/fonts.inc + PAR="${ME} $1" + echo "^sep(Font)" + while read -r x + do + echo "$x,$ME setvar \"font=\'${x}\'\";$PAR fixed" + done < "$CNF_DIR"/inc/fonts.inc } case "$1" in @@ -368,5 +318,4 @@ case "$1" in setvar) setvar "$2";; *) about;; esac - exit 0 diff --git a/share/icons/hicolor/48x48/apps/mbx-lpanel.png b/share/icons/hicolor/48x48/apps/mbx-lpanel.png index f7758510be48111658054aaad3d85724aee6abc6..f95c2f1aa81ff5d9ff716f374d46c01dcf91f988 100644 GIT binary patch delta 519 zcmV+i0{H#S1-AqtiBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bn2{koe*wfv zL_t(oh0WN{PQow%$8r922xtO~?PQ`MasZz|l!TM7!P9sU5-^^i-TMrPkDyzO36P*7 zOww&^fTtnC5C&_<_u91i9Dk|bcOW5z3Z`#*=RX99<{wvwN9q}?pF}+aK?w62Fsm47 z=>{jqI+1~|DCZR56{HVFX)!6qf4b4(pL1%UO%Q6JUkFZ%$>+5Y;vlCGVju`%UJZ^P z`V77hxtCZsGH`U?HIN1AF-oezONn0id#88y2Dt^<8{{@*XAmifV-RV`)*uLBUJn|? zAsa!95RsP>?}Q<1K@h^c4vfbhP*Nf<#b`lRKywJAq(qKBWDXJp;Z_akf0YgxoVIv5 z{t+H|0;0<{O1)%rrEkzD8D>4>Um#uCQM#V_;;TlCSLB@h5dmQO+qVi_uG% zEy$`~ujh1NlrS)|O-^Rp(Jya7cCZE~v7M;1IpI2J5vGB0Sp{Z>6wDEb25ct~N!VT> zD}>NB4rnD6n3*Oov2BNwUDb7vn=n^F%P?+m<|)VuAym);Mr9bn=bnC8EoXh{{Q$4Uhkpoc)o}m-002ov JPDHLkV1fk2*Zcqg delta 670 zcmV;P0%85P1kD8@iBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hmj#Xe*#)b zL_t(&fz{Z{Y7s8LctV#hCYI6Q)#-0S1@(em9OAJp=ly0K}Jf*6U=17ECi7$ zh%ezr1)+7Lc2QG<*al&Sj4+pTCLu25OT}KC`#JM}fW!AYi?cX6A)|FV;@!z4_c+IT zNYE6eb&HVi4a<77lFu*dbF2sXe@&9MZ;wVl>W1-hh0-qtK@fyY05IG%wdwG`;}#&x zPw#l%pkbO?@vPy9I{=0chp&p1?w>mxaRUfC95DwdO0!DH&w9||h#3IG4de9^rTdq{ zo|8J@&+wy7UEe8r-q*l4{%@%P;vS9?2PjIjYTHLOUEf)bb2v&2ko0gAe>)(p;V3r1 z$#8Ai^LmL7N09-nhNI8`MQK)D_qe9(TFLWzq2KYS1qSdk9Qg+DHXQvIfZ>Lrl_=$B zI64;~N#e$MJa}LjT9L=$=oCPb#EsEt@X$10T;X{*ngX&m9L;q);ypqR?+=I1mprdO z&w5bMW+s!FV?mhzH9Natf3qGFrs=!UTX6rFFw~d$lMKrT`QL!UX_@fp7&tvb=qh(r=r7AY1~F9|+d~bP*&I z0CWO*w?@e4f*@oJfB>=Ww`=+QqMkVb>UN*4kH^B3-@qFYuIFVaH2?qr07*qoM6N<$ Ef_yC}`~Uy| diff --git a/share/icons/hicolor/48x48/apps/mbx-rpanel.png b/share/icons/hicolor/48x48/apps/mbx-rpanel.png index b01c7264461ed76d0840aa17fd0d6dfee490525d..8e6e3950066a786752e0209e357e61089445c2b7 100644 GIT binary patch delta 542 zcmV+(0^$9}15$K7?N}reSi|L7g1@ zh=ZHa7@t6cs6`M5S`@B>xk~T@C~dF*@#N&>w;k9pHct)1n1p{)03$q}4?XWJXV)+P z11wNOwd(HhMeo7T^=OVOZm(q5f36I}n4$$jtJ(G9mU1SMLClgsHAjk(s*vaE?4qvg z`&2=+VZVZC!CHd+hP4gy3)V4+)NhNRnu)@oEk3vja}4qd)-{L}u?0w)O4l&gK#j1J zsT2kr!dwS6!=kqE$k#&)?ZP|*{R9g^aB*&SZjUOcQB;P=d5FQ89nx-B9wC6b}R*^t`N<2kuG4~h5a}a^_ z*+MRi*_IH`Ku#g9gSv&dbOwr95~zg_h={n%%@L=v>~6M9^AuD-;9;yH~xmNvFYaT>pKWx gbRM_mCE5_uJ1DSg;K^gTiU0rr07*qoM6N<$f?8Pk4gdfE delta 663 zcmV;I0%-lt1jYp+iBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hmj#Xe*#lU zL_t(&fz{eQZ__{=$MG}q-TBVR$^vOr8Yl1uDy6NeBF6GMQeULLf>I@AK|pv~8iX1N zi6XJ`P_ePGw5igyOIOsfRU219G7Qz9(kd9+xwFsT**^U~Rw8*YT3=uL-s!aNql{*> z+lvRo;r?~Yn%QQo`bLPA4{48zf0EH|FCLtnY?Tl~h>)_EHOM6ZlqJYW07OXHAY%a_j3)-1&-5(o&PLJ@DF6uLqR08{ z4yCudjYexz#+m<1DgZi%%=IX(Zm5PR0YFJWlmZ}?kVF8G3P_>=NG2o|e*lDW(PM0` zXIb$fsRE#JAX)$*fH3BCg?RWb%spBGpuZumyS8Z<#;<=}t0e$B|FhrSqx9BWA)4J$ z5Ul}F5F`@-$TV-B<@5LYgiQW{WC{RbTspJug&w7oooi{2iBm3D82Wzhr|wr6(l;D{e`NwNYB;1dAZR$GC4i91v28E(87n=l*H^vToC(fQ;c#q5wiF1KXbO6HIcAFjm`P%z3VAI3yL2