diff --git a/README.md b/README.md index 54f8f09..d794279 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ + # mbxutils -Mabox X11 utils - a distro DE/WM independent tools for X11 \ No newline at end of file +Mabox X11 utils - a set of lightweight and handy utulities for your X11 window manager +Based on jgmenu. + + + + + +a distro DE/WM independent tools for X11 diff --git a/bin/mbx b/bin/mbx index 18a622c..74e5847 100755 --- a/bin/mbx +++ b/bin/mbx @@ -128,37 +128,29 @@ appsmenu() { rm -f ~/.config/jgmenu/append.csv if [[ $apps_in == "submenu" ]] then +#export XDG_CONFIG_HOME="$CNF_DIR/submenu/" cat < "$HOME"/.config/jgmenu/prepend.csv @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 +. ~/.config/mbxutils/inc/menu_top.csv Applications,^checkout(apps),applications-other -. ~/.config/mbxutils/inc/m_after_apps.csv ^sep() -Logout dialog,mb-jgtools mblogout,system-shutdown -Preferences,^pipe(mbx-preferences appsmenu),settings -Preferences,mbx-preferences appsmenu st,settings -^sep() -About mbxutils,mbx +. ~/.config/mbxutils/inc/menu_bottom.csv ^tag(apps) EOF + else cat < "$HOME"/.config/jgmenu/prepend.csv @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 +. ~/.config/mbxutils/inc/menu_top.csv ^sep(Applications) + EOF cat < "$HOME"/.config/jgmenu/append.csv -. ~/.config/mbxutils/inc/m_after_apps.csv ^sep() -Logout dialog,mb-jgtools mblogout,system-shutdown -Preferences,^pipe(mbx-preferences appsmenu),settings -Preferences,mbx-preferences appsmenu st,settings -^sep() -About mbxutils,mbx - +. ~/.config/mbxutils/inc/menu_bottom.csv EOF fi configure @@ -195,16 +187,16 @@ cat < "${MENU_ITEMS}" @icon,,$((menu_padding+item_margin_x)),${menu_padding},48,48,0,left,top,,,/usr/share/mbxutils/logos/distributor-logo-${logo}.svg @text,,$((menu_padding+item_margin_x+50)),${menu_padding},180,32,0,left,top,${fgcolor},#DDDDDD,$distro ${OSVERSION} ${OSCODE} @text,,$((menu_padding+item_margin_x+50)),$((menu_padding+20)),180,32,0,left,top,${fgcolor},#DDDDDD,${XDG_SESSION_DESKTOP^} -. ~/.config/mbxutils/inc/ltop.csv +. ~/.config/mbxutils/inc/left_top.csv ^sep(File browser) -$HOME,^pipe(mbxfiles ~) -~/.config,^pipe(mbxfiles ~/.config) -/etc,^pipe(mbxfiles /etc) +$HOME,^pipe(mbxdir ~) +~/.config,^pipe(mbxdir ~/.config) +/etc,^pipe(mbxdir /etc) ^sep(mbxutils) Preferences,^pipe(mbx-preferences lpanel) Preferences,mbx-preferences lpanel st -. ~/.config/mbxutils/inc/lbottom.csv +. ~/.config/mbxutils/inc/left_bottom.csv EOF jgmenu --config-file="${CONFIG_FILE}" --csv-file="${MENU_ITEMS}" 2>/dev/null } @@ -227,11 +219,11 @@ cat < "${MENU_ITEMS}" @icon,,$((menu_padding+item_margin_x)),${menu_padding},48,48,0,left,top,,,/usr/share/mbxutils/logos/distributor-logo-${logo}.svg @text,,$((menu_padding+item_margin_x+50)),${menu_padding},180,32,0,left,top,${fgcolor},#DDDDDD,$distro ${OSVERSION} ${OSCODE} @text,,$((menu_padding+item_margin_x+50)),$((menu_padding+20)),180,32,0,left,top,${fgcolor},#DDDDDD,${XDG_SESSION_DESKTOP^} -. ~/.config/mbxutils/inc/rtop.csv +. ~/.config/mbxutils/inc/right_top.csv ^sep(Right Panel) Preferences,^pipe(mbx-preferences rpanel) Preferences,mbx-preferences rpanel st -. ~/.config/mbxutils/inc/rbottom.csv +. ~/.config/mbxutils/inc/right_bottom.csv EOF jgmenu --config-file="${CONFIG_FILE}" --csv-file="${MENU_ITEMS}" 2>/dev/null } diff --git a/bin/mbx-preferences b/bin/mbx-preferences index 7582b69..e91c7b2 100755 --- a/bin/mbx-preferences +++ b/bin/mbx-preferences @@ -122,18 +122,18 @@ main() { 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") + out+=("Favorites,xdg-open ~/.config/mbxutils/inc/menu_top.csv") + out+=("Commands below Apps,xdg-open ~/.config/mbxutils/inc/menu_bottom.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") + out+=("Top,xdg-open ~/.config/mbxutils/inc/left_top.csv") + out+=("Bottom,xdg-open ~/.config/mbxutils/inc/left_bottom.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") + out+=("Top,xdg-open ~/.config/mbxutils/inc/right_top.csv") + out+=("Bottom,xdg-open ~/.config/mbxutils/inc/right_bottom.csv") ;; all) out+=("^sep(Custom commands ALL)") @@ -145,7 +145,7 @@ main() { 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 BGcolor:" "[$color_menu_bg]"),^checkout(bgcolor)") out+=("$(printf "%-15s %24s" "Menu Padding:" "[$menu_padding]"),^checkout(menupadding)") out+=("^sep()") out+=("Reset to default,mbx reset ${1}") @@ -159,7 +159,7 @@ main() { out+=("Edit config file,xdg-open $CNF_FILE") out+=("Open config dir,xdg-open $CNF_DIR") out+=("^sep()") - out+=("About mbxutils,mbx") + out+=("About mbxutils,mbx") #tags diff --git a/bin/mbxfiles b/bin/mbxdir similarity index 100% rename from bin/mbxfiles rename to bin/mbxdir diff --git a/share/applications/mbx-mmenu.desktop b/share/applications/mbx-mmenu.desktop index a576061..a771f65 100644 --- a/share/applications/mbx-mmenu.desktop +++ b/share/applications/mbx-mmenu.desktop @@ -5,8 +5,8 @@ Name=MBX Main Menu Comment=Main menu (mbxutils) Keywords= StartupNotify=false -Icon=mbx-mmenu +Icon=mbx-appsmenu TryExec=mbx -Exec=mbx mmenu +Exec=mbx appsmenu Categories=Utility; #NoDisplay=true diff --git a/share/mbxutils/inc/lbottom.csv b/share/mbxutils/inc/left_bottom.csv similarity index 55% rename from share/mbxutils/inc/lbottom.csv rename to share/mbxutils/inc/left_bottom.csv index 4295857..3004ad8 100644 --- a/share/mbxutils/inc/lbottom.csv +++ b/share/mbxutils/inc/left_bottom.csv @@ -1,7 +1,7 @@ ^sep(Custom Commands) btop,^term(btop) Random BGcolor,mbx setvar color_menu_bg=$(shuf -n 1 ~/.config/mbxutils/inc/colors.clr);mbx lpanel -^sep() -Edit commands,xdg-open ~/.config/mbxutils/inc/lbottom.csv -^sep() -About mbxutils,mbx about +#^sep() +#Edit commands,xdg-open ~/.config/mbxutils/inc/lbottom.csv +#^sep() +#About mbxutils,mbx about diff --git a/share/mbxutils/inc/ltop.csv b/share/mbxutils/inc/left_top.csv similarity index 100% rename from share/mbxutils/inc/ltop.csv rename to share/mbxutils/inc/left_top.csv diff --git a/share/mbxutils/inc/m_after_apps.csv b/share/mbxutils/inc/m_after_apps.csv deleted file mode 100644 index 8b13789..0000000 --- a/share/mbxutils/inc/m_after_apps.csv +++ /dev/null @@ -1 +0,0 @@ - diff --git a/share/mbxutils/inc/menu_bottom.csv b/share/mbxutils/inc/menu_bottom.csv new file mode 100644 index 0000000..fa525de --- /dev/null +++ b/share/mbxutils/inc/menu_bottom.csv @@ -0,0 +1,4 @@ +Logout dialog,mb-jgtools mblogout,system-shutdown +Preferences,^pipe(mbx-preferences appsmenu),settings +#Preferences,mbx-preferences appsmenu st,settings + diff --git a/share/mbxutils/inc/favorites.csv b/share/mbxutils/inc/menu_top.csv similarity index 100% rename from share/mbxutils/inc/favorites.csv rename to share/mbxutils/inc/menu_top.csv diff --git a/share/mbxutils/inc/rbottom.csv b/share/mbxutils/inc/right_bottom.csv similarity index 100% rename from share/mbxutils/inc/rbottom.csv rename to share/mbxutils/inc/right_bottom.csv diff --git a/share/mbxutils/inc/rtop.csv b/share/mbxutils/inc/right_top.csv similarity index 100% rename from share/mbxutils/inc/rtop.csv rename to share/mbxutils/inc/right_top.csv