diff --git a/bin/mbx b/bin/mbx index 6cc2e4b..a26b83e 100755 --- a/bin/mbx +++ b/bin/mbx @@ -2,7 +2,6 @@ # mbxutils: handy utilities for your X11 window manager. # Copyright (C) 2021 Daniel Napora # -# TODO Preferences standalone # TODO Logout Dialog postponed # TODO Filebrowser standalone postponed @@ -29,10 +28,8 @@ fg(){ [ "$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" } - -###fgcolor=$(fg $bgcolor) fg "$bgcolor" -#KOLOR FG +[ "$menu_padding" == "0" ] && item_margin_x=0 item_margin_y=0 item_radius=0 item_padding_x=8 configure() { if [ -f /usr/share/mbxutils/mbxutils.inc ];then @@ -66,7 +63,7 @@ menu_radius = ${menu_radius:-1} # ITEMS item_height = $((font_size*item_height_factor/100)) item_halign = ${item_halign:-left} -item_padding_x = 2 +item_padding_x = {item_padding_x:-2} item_margin_x = ${item_margin_x:-3} item_margin_y = ${item_margin_y:-3} @@ -101,7 +98,7 @@ EOF fi } -mmenu() { +appsmenu() { CONFIG_FILE=$(mktemp) trap "rm -f ${CONFIG_FILE}" EXIT font_size=${font_size:-12} @@ -113,60 +110,71 @@ mmenu() { menu_padding_top=$((font_size*item_height_factor/100+menu_padding)) icon_size=$((font_size*item_height_factor/100-2)) - #CHujowy HAK - #apps_in_submenu=true rm -f ~/.config/jgmenu/append.csv -if [[ $apps_in_submenu == true ]] +if [[ $apps_in == "submenu" ]] then - cat < $HOME/.config/jgmenu/prepend.csv -@text,,$((menu_padding + 24)),$((menu_padding_top-font_size*item_height_factor/100)),150,20,0,left,top,auto,#000000,🔍 -@search,,$((menu_padding + 38)),$((menu_padding + 4)),150,20,2,left,top,auto,#000000 0,type to search +@text,,$((menu_padding+10)),$((menu_padding_top-font_size*item_height_factor/100+2)),150,$((font_size*item_height_factor/100)),0,left,top,auto,#000000,🔍 +@search,,$((menu_padding+32)),$((menu_padding_top-font_size*item_height_factor/100)),150,$((font_size*item_height_factor/100)),2,left,top,auto,#000000, type to search . ~/.config/mbxutils/inc/favorites.csv -$APPS,^checkout(apps),applications-other +Applications,^checkout(apps),applications-other . ~/.config/mbxutils/inc/m_after_apps.csv ^sep() Logout dialog,mb-jgtools mblogout,system-shutdown -Preferences,^pipe($ME preferences mmenu),firefox +Preferences,^pipe(mbx-preferences appsmenu),settings +Preferences,mbx-preferences appsmenu st,settings +^sep() +About mbxutils,mbx ^tag(apps) EOF else cat < $HOME/.config/jgmenu/prepend.csv -@text,,$((menu_padding+20)),$((menu_padding_top-font_size*item_height_factor/100)),150,$((font_size*item_height_factor/100)),0,left,top,auto,#000000,🔍 -@search,,$((menu_padding + 38)),$((menu_padding_top-font_size*item_height_factor/100)),150,$((font_size*item_height_factor/100)),2,left,top,auto,#000000, type to search +@text,,$((menu_padding+10)),$((menu_padding_top-font_size*item_height_factor/100+2)),150,$((font_size*item_height_factor/100)),0,left,top,auto,#000000,🔍 +@search,,$((menu_padding+32)),$((menu_padding_top-font_size*item_height_factor/100)),150,$((font_size*item_height_factor/100)),2,left,top,auto,#000000, type to search . ~/.config/mbxutils/inc/favorites.csv +^sep(Applications) EOF - cat < $HOME/.config/jgmenu/append.csv . ~/.config/mbxutils/inc/m_after_apps.csv ^sep() -Preferences,^pipe($ME preferences mmenu),firefox +Logout dialog,mb-jgtools mblogout,system-shutdown +Preferences,^pipe(mbx-preferences appsmenu),settings +Preferences,mbx-preferences appsmenu st,settings ^sep() About mbxutils,mbx -^sep() -Logout dialog,mb-jgtools mblogout,system-shutdown + EOF fi - configure jgmenu --config-file=${CONFIG_FILE} --no-append 2>/dev/null } lpanel() { + OSNAME=$(lsb_release -d | awk '{print $2}') #Mabox + OSVERSION=$(lsb_release -r | awk '{print $2}') #21.10 + OSCODE=$(lsb_release -c | awk '{print $2}') # Geralt + CONFIG_FILE=$(mktemp) MENU_ITEMS=$(mktemp) trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT - + menu_padding_top=$((menu_padding+item_margin_y+32)) menu_halign="left" configure + + #${HOSTNAME:-$(hostname)}@${USER} cat < ${MENU_ITEMS} +@icon,,$((menu_padding+item_margin_x)),${menu_padding},32,32,0,left,top,,,/usr/share/icons/hicolor/scalable/apps/mbx-lpanel.svg +@text,,$((menu_padding+item_margin_x+32)),${menu_padding},180,32,0,left,top,${fgcolor},#DDDDDD,${OSNAME} ${XDG_SESSION_DESKTOP^} ${OSVERSION} . ~/.config/mbxutils/inc/ltop.csv ^sep(File browser) -/etc,^pipe(mbxfiles /etc) +$HOME,^pipe(mbxfiles ~) ~/.config,^pipe(mbxfiles ~/.config) +/etc,^pipe(mbxfiles /etc) ^sep(mbxutils) -Left panel,,firefox +Preferences,^pipe(mbx-preferences lpanel) +Preferences,mbx-preferences lpanel st + . ~/.config/mbxutils/inc/lbottom.csv EOF jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null @@ -184,7 +192,8 @@ rpanel() { cat < ${MENU_ITEMS} . ~/.config/mbxutils/inc/rtop.csv ^sep(Right Panel) -Right Panel,,terminal +Preferences,^pipe(mbx-preferences rpanel) +Preferences,mbx-preferences rpanel st . ~/.config/mbxutils/inc/rbottom.csv EOF jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null @@ -202,24 +211,25 @@ about() { columns=2 icon_size=$((font_size*item_height_factor/100-2)) menu_halign=center - menu_padding=8 + #menu_padding=8 menu_width=$((twidth+menu_padding*2)) item_height=$((font_size*item_height_factor/100)) - menu_padding_top=$((theight+menu_padding*2+40)) - menu_height_max=$((menu_padding_top+menu_padding+item_height*7+sep_height*6)) - menu_height_min=$((menu_padding_top+menu_padding+item_height*7+sep_height*6)) + menu_padding_top=$((theight+menu_padding+60)) + menu_height_max=$((menu_padding_top+menu_padding+item_height*6+item_margin_y*10)) + #menu_height_min=$((menu_padding_top+menu_padding+item_height*6+item_margin_y*10)) configure cat < ${MENU_ITEMS} @icon,,${menu_padding},${menu_padding},${twidth},${theight},4,left,top,,,$THUMB -@text,,$((menu_padding+20)),$((menu_padding+theight)),${twidth},25,4,left,top,${fgcolor},#DDDDDD,mbxutils 0.2.0 (technical preview) -@text,,$((menu_padding+40)),$((menu_padding+theight+20)),${twidth},25,4,left,top,${fgcolor} 60,${fgcolor} 12,a set of lightweight and handy utilities for your X11 window manager -#^sep(mbxutils handy utils for your X11 window manager) +@text,,$((menu_padding+6)),$((menu_padding+theight+4)),${twidth},25,4,left,top,${fgcolor},#DDDDDD,mbxutils v0.2.0 (alpha) +@text,,$((menu_padding+40)),$((menu_padding+theight+26)),${twidth},25,4,left,top,${fgcolor} 60,${fgcolor} 12,a set of lightweight and handy utilities +@text,,$((menu_padding+56)),$((menu_padding+theight+38)),${twidth},25,4,left,top,${fgcolor} 60,${fgcolor} 12,for your X11 window manager ^sep(Utilities) -Main menu,mbx mmenu,menu -Left SidePanel,mbx lpanel,arrow-left -Right SidePanel,mbx rpanel,arrow-right +Apps menu (main),mbx appsmenu,menu +Left SidePanel,mbx lpanel,mbx-lpanel +Right SidePanel,mbx rpanel,mbx-rpanel +Logout Dialog, mbx Quick Filebrowser,mbx files,folder -Preferences,^pipe(mbx preferences mmenu),firefox +Preferences,mbx-preferences about st ^sep(Manual) Configure keybindings,xdg-open https://mbxutils.maboxlinux.org,firefox Roadmap @@ -228,7 +238,7 @@ EOF jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null } -setvar() { +setvar() { # Może tu niepotrzebnie a tylko w mbx-preferences search="$(echo $1|cut -d= -f1)=" if grep -Rq $search $CNF_FILE then #found @@ -237,84 +247,11 @@ setvar() { echo $1 >> $CNF_FILE fi } -preferences() { - # if $1 brak then standalone - - PAR="${ME} $1" - out+=("^sep(mbxutils Global Settings)") - - out+=("^sep(Appearance)") - 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 %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") - out+=("Open config dir,xdg-open $CNF_DIR") - #tags - - out2+=("^tag(fontsize)") - out2+=("^sep(Font size)") - for i in 10 11 12 13 14 15 16 18 20; do out2+=("$(printf "%4s,%s" "$i" "$ME setvar font_size=${i};$PAR fixed")");done - - out2+=("^tag(lineheight)") - for i in 120 140 160 180 200 240 280; do out2+=("$(printf "%4s%%,%s" "$i" "$ME setvar item_height_factor=${i};$PAR fixed")");done - - out2+=("^tag(bgcolor)") - out2+=("^sep(Select BGcolor)") - out2+=("Pick color from screen") - colors="$CNF_DIR/inc/colors.clr" - while read -r color - do - fg $color - out2+=(" $color $rgb,mbx setvar bgcolor='$color';$PAR fixed") - done < "$colors" - - out2+=("^tag(terminal)") - out2+=("^sep(Select Terminal)") - terminals="$CNF_DIR/inc/terminals.inc" - while read -r term - do - 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" - while read -r fm - do - out2+=("$fm,mbx setvar filemanager=$fm;$PAR fixed") - done < "$filemanagers" - - if [[ -z $1 ]]; then - echo "standalone" - exit 0 - else - - 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 -} case "$1" in - mmenu) mmenu "$2";; + appsmenu) appsmenu "$2";; lpanel) lpanel;; rpanel) rpanel;; - preferences) preferences "$2";; - fonts) fonts "$2";; setvar) setvar "$2";; *) about;; esac diff --git a/bin/mbx-preferences b/bin/mbx-preferences new file mode 100755 index 0000000..21724bd --- /dev/null +++ b/bin/mbx-preferences @@ -0,0 +1,229 @@ +#!/bin/bash +# mbxutils: handy utilities for your X11 window manager. +# Copyright (C) 2021 Daniel Napora +# +# mbx-preferences appsmenu|lpanel|rpanel|about - pipemenu +# mbx-preferences appsmenu|lpanel|rpanel|about st - standalone +ME=$(basename "$0") + +CNF_DIR="$HOME/.config/mbxutils" +CNF_FILE="$CNF_DIR/mbx.conf" +source <(grep = $CNF_FILE) + +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" +} +fgc(){ + 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"|| fgcolor="#EEEEEE" + +} +[ "$menu_padding" == "0" ] && item_margin_x=0 item_margin_y=0 item_radius=0 item_padding_x=8 + +configure() { +if [ -f /usr/share/mbxutils/mbxutils.inc ];then +. /usr/share/mbxutils/mbxutils.inc +else +cat < ${CONFIG_FILE} +position_mode = ${position_mode:-fixed} +csv_cmd = apps +stay_alive = 0 +terminal_exec = ${terminal:-terminator} +terminal_args = -e +hover_delay = 80 +columns = ${columns:-1} +# MENU +menu_halign = ${menu_halign:-left} +menu_valign = ${menu_valign:-center} +menu_margin_x = ${menu_margin_x:-4} +menu_margin_y = ${menu_margin_y:-4} +sub_spacing = ${sub_spacing:-2} +menu_width = ${menu_width:-20} +menu_border = 1 + +menu_height_min = ${menu_height_min:-0} +menu_height_max = ${menu_height_max:-0} +menu_padding_top = ${menu_padding_top:-5} +menu_padding_right = ${menu_padding:-5} +menu_padding_bottom = ${menu_padding:-5} +menu_padding_left = ${menu_padding:-5} +menu_radius = ${menu_radius:-1} + +# ITEMS +item_height = $((font_size*item_height_factor/100)) +item_halign = ${item_halign:-left} +item_padding_x = {item_padding_x:-2} + +item_margin_x = ${item_margin_x:-3} +item_margin_y = ${item_margin_y:-3} +item_radius = ${item_radius:-2} +item_border = ${item_border:-1} +arrow_string = ${arrow_string:-▸} +hide_back_items = ${hide_back_items:-0} + +# COLORS +color_sel_bg = ${color_sel_bg:-} +color_sel_fg = ${color_sel_fg:-} +color_sel_border = ${color_sel_border:-#eeeeee 40} +color_norm_fg = ${fgcolor:-} +color_title_fg = ${color_title_fg:-} +color_menu_bg = ${bgcolor:-#0F2437} +color_menu_border = #eeeeee 8 +color_title_bg = ${color_title_bg:-"$fgcolor 12"} +color_title_border = ${color_title_border:-} +color_sep_fg = ${color_sep_fg:-} +icon_theme = ${icon_theme:-} +icon_size = ${icon_size:-0} +icon_norm_alpha = 70 +icon_sel_alpha = 100 +icon_text_spacing = $((icon_size/4)) +font_size = ${font_size:-12} +font = ${font} ${font_size}px + +sep_markup = weight="bold" +sep_halign = ${sep_halign:-center} +sep_height = ${sep_height:-3} +EOF +fi +} +fonts(){ + PAR="mbx $1" + echo "^sep(Font)" + while read -r x + do + echo "$x,$ME setvar \"font=\'${x}\'\";$PAR fixed" + done < "$CNF_DIR"/inc/fonts.inc +} +setvar() { + search="$(echo $1|cut -d= -f1)=" + if grep -Rq $search $CNF_FILE + then #found + sed -i s/^"$search".*$/"$1"/ $CNF_FILE + else #not found + echo $1 >> $CNF_FILE + fi +} +me() { + # if $1 brak then standalone + + PAR="mbx ${1:-preferences}" + case "$1" in + appsmenu) + out+=("^sep(Apps Menu)") + out+=("$(printf "%-15s %24s" "Show Apps in:" "[$apps_in]"),^checkout(appsin)") + out+=("^sep(Custom commands in Apps Menu)") + out+=("Favorites,xdg-open ~/.config/mbxutils/inc/favorites.csv") + out+=("Commands below Apps,xdg-open ~/.config/mbxutils/inc/m_after_apps.csv") + ;; + lpanel) + out+=("^sep(Custom commands in Left Sidepanel)") + out+=("Top,xdg-open ~/.config/mbxutils/inc/ltop.csv") + out+=("Bottom,xdg-open ~/.config/mbxutils/inc/lbottom.csv") + ;; + rpanel) + out+=("^sep(Custom commands in Right Sidepanel)") + out+=("Top,xdg-open ~/.config/mbxutils/inc/rtop.csv") + out+=("Bottom,xdg-open ~/.config/mbxutils/inc/rbottom.csv") + ;; + all) + out+=("^sep(Custom commands ALL)") + ;; + esac + out+=("^sep(Global Settings)") + + out+=("^sep(Appearance)") + 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" "Menu BGcolor:" "[$bgcolor]"),^checkout(bgcolor)") + out+=("$(printf "%-15s %24s" "Menu Padding:" "[$menu_padding]"),^checkout(menupadding)") + + out+=("^sep(Other)") + 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(Config files)") + out+=("Edit config file,xdg-open $CNF_FILE") + out+=("Open config dir,xdg-open $CNF_DIR") + out+=("^sep()") + out+=("About mbxutils,mbx") + #tags + + + out2+=("^tag(fontsize)") + out2+=("^sep(Font size)") + for i in 10 11 12 13 14 15 16 18 20; do out2+=("$(printf "%4s,%s" "$i" "$ME setvar font_size=${i};$PAR fixed")");done + + out2+=("^tag(lineheight)") + for i in 120 140 160 180 200 240 280; do out2+=("$(printf "%4s%%,%s" "$i" "$ME setvar item_height_factor=${i};$PAR fixed")");done + + out2+=("^tag(bgcolor)") + out2+=("^sep(Select BGcolor)") + out2+=("Pick color from screen") + colors="$CNF_DIR/inc/colors.clr" + while read -r color; do + fgc $color + out2+=(" $color ,mbx setvar bgcolor='$color';$PAR fixed") + done < "$colors" + + out2+=("^tag(menupadding)") + for i in 0 2 5 8 12 16; do out2+=("$(printf "%4s,%s" "$i" "$ME setvar menu_padding=${i};$PAR fixed")");done + + out2+=("^tag(appsin)") + out2+=("^sep()") + out2+=("root,$ME setvar apps_in=root;$PAR fixed") + out2+=("submenu,$ME setvar apps_in=submenu;$PAR fixed") + + out2+=("^tag(terminal)") + out2+=("^sep(Select Terminal)") + terminals="$CNF_DIR/inc/terminals.inc" + while read -r term + do + 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" + while read -r fm + do + out2+=("$fm,mbx setvar filemanager=$fm;$PAR fixed") + done < "$filemanagers" + + if [[ "$2" == "st" ]]; then + CONFIG_FILE=$(mktemp) + MENU_ITEMS=$(mktemp) + trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT + case "$1" in + lpanel) menu_halign="left";; + rpanel) menu_halign="right";; + about) menu_halign="center";; + esac + fg "$bgcolor" + [ "$menu_padding" == "0" ] && item_margin_x=0 item_margin_y=0 item_radius=0 + configure + cat < ${MENU_ITEMS} +$(printf '%s\n' "${out[@]}") +$(printf '%s\n' "${out2[@]}") +EOF +jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null + exit 0 + else + + printf '%s\n' "${out[@]}" + printf '%s\n' "${out2[@]}" + fi +} + +case "$1" in + fonts) fonts "$2";; + setvar) setvar "$2";; + appsmenu|lpanel|rpanel|about) me "$1" "$2";; + *) me;; +esac +exit 0 diff --git a/share/icons/hicolor/48x48/apps/mbx-lpanel.png b/share/icons/hicolor/48x48/apps/mbx-lpanel.png index f95c2f1..7180e03 100644 Binary files a/share/icons/hicolor/48x48/apps/mbx-lpanel.png and b/share/icons/hicolor/48x48/apps/mbx-lpanel.png differ diff --git a/share/icons/hicolor/48x48/apps/mbx-rpanel.png b/share/icons/hicolor/48x48/apps/mbx-rpanel.png index 8e6e395..0dd314c 100644 Binary files a/share/icons/hicolor/48x48/apps/mbx-rpanel.png and b/share/icons/hicolor/48x48/apps/mbx-rpanel.png differ diff --git a/share/icons/hicolor/scalable/apps/mbx-lpanel.svg b/share/icons/hicolor/scalable/apps/mbx-lpanel.svg index 1382cb3..bf90987 100644 --- a/share/icons/hicolor/scalable/apps/mbx-lpanel.svg +++ b/share/icons/hicolor/scalable/apps/mbx-lpanel.svg @@ -9,6 +9,9 @@ id="svg5" inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" sodipodi:docname="mbx-lpanel.svg" + inkscape:export-filename="/home/napcok/GitLab/mbxutils/share/icons/hicolor/48x48/apps/mbx-lpanel.png" + inkscape:export-xdpi="38.400002" + inkscape:export-ydpi="38.400002" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" diff --git a/share/icons/hicolor/scalable/apps/mbx-rpanel.svg b/share/icons/hicolor/scalable/apps/mbx-rpanel.svg index 61ac0f4..2ec603d 100644 --- a/share/icons/hicolor/scalable/apps/mbx-rpanel.svg +++ b/share/icons/hicolor/scalable/apps/mbx-rpanel.svg @@ -9,6 +9,9 @@ id="svg5" inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" sodipodi:docname="mbx-rpanel.svg" + inkscape:export-filename="/home/napcok/GitLab/mbxutils/share/icons/hicolor/48x48/apps/mbx-rpanel.png" + inkscape:export-xdpi="38.400002" + inkscape:export-ydpi="38.400002" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -60,7 +63,7 @@ style="opacity:0.99;fill:#34be5b;fill-opacity:1;stroke:#999999;stroke-width:2.029;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 18.578396,19.916354 C 98.746009,59.934602 98.746009,59.934602 98.746009,59.934602 L 18.578396,100.08397 Z" id="path1416" - inkscape:export-filename="/home/napcok/GitLab/mbxutils/share/icons/hicolor/48x48/apps/mbx-lpanel.png" + inkscape:export-filename="/home/napcok/GitLab/mbxutils/share/icons/hicolor/48x48/apps/mbx-rpanel.png" inkscape:export-xdpi="41.279999" inkscape:export-ydpi="41.279999" /> diff --git a/share/mbxutils/inc/colors.clr b/share/mbxutils/inc/colors.clr index ed2585a..056b1c6 100644 --- a/share/mbxutils/inc/colors.clr +++ b/share/mbxutils/inc/colors.clr @@ -1,26 +1,24 @@ #FFFFFF +#F5F6E8 +#EEEEEE +#D0AD9A +#D0E2EE #FFF79C #FED883 #FEBE40 -#F8C09D -#F5F6E8 -#EF937E -#EEEEEE -#EE8EB4 #EC7523 -#EA676C -#DD94C1 -#D0E2EE -#D0AD9A #556B2F +#F8C09D +#DD94C1 +#EA676C #432355 -#3b3b3b -#3A4D5C #311A12 -#252525 #1D5C87 -#181818 +#3A4D5C #143441 -#111111 #0F2437 +#3b3b3b +#252525 +#181818 +#111111 #000000 diff --git a/share/mbxutils/inc/lbottom.csv b/share/mbxutils/inc/lbottom.csv index 5b7ba47..1befe70 100644 --- a/share/mbxutils/inc/lbottom.csv +++ b/share/mbxutils/inc/lbottom.csv @@ -1,7 +1,7 @@ -^sep() -Preferences,^pipe(mbx preferences lpanel) ^sep(Custom Commands) btop,^term(btop) -uname -a,^term(uname -a ;$SHELL) +Random BGcolor,mbx setvar bgcolor=$(shuf -n 1 ~/.config/mbxutils/inc/colors.clr);mbx lpanel ^sep() -Edit commands,xdg-open ~/.config/mbxutils/inc/lbottom.csv,geany +Edit commands,xdg-open ~/.config/mbxutils/inc/lbottom.csv +^sep() +Preferences,mbx-preferences lpanel diff --git a/share/mbxutils/inc/ltop.csv b/share/mbxutils/inc/ltop.csv index 7c18a1a..34803d5 100644 --- a/share/mbxutils/inc/ltop.csv +++ b/share/mbxutils/inc/ltop.csv @@ -1,5 +1,5 @@ ^sep(Custom Commands) The Gimp,gimp Inkscape,inkscape -^sep() -Edit commands,xdg-open ~/.config/mbxutils/inc/ltop.csv +#^sep() +#Edit commands,xdg-open ~/.config/mbxutils/inc/ltop.csv diff --git a/share/mbxutils/inc/m_after_apps.csv b/share/mbxutils/inc/m_after_apps.csv index 065073a..8b13789 100644 --- a/share/mbxutils/inc/m_after_apps.csv +++ b/share/mbxutils/inc/m_after_apps.csv @@ -1,7 +1 @@ -^sep() -^sep(Terminal test) -Btop,^term(btop) -uname,^term(uname -a;/bin/bash) -neofetch,^term(neofetch;/bin/bash) -YAy,^term(yay) -^sep() +