From 0b5fbbf53c7e8bfca9a3307684cb3fe9ca0db3c7 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Mon, 16 Sep 2024 00:50:38 +0200 Subject: [PATCH] upd --- bin/colorizer-conky | 3 +++ bin/colorizer-fonts | 2 +- bin/conkyctl | 6 ++++-- share/mabox-colorizer/help/en.html | 2 +- share/mabox-colorizer/help/pl.html | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bin/colorizer-conky b/bin/colorizer-conky index 6599a68..9ff6650 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -124,6 +124,7 @@ case "$LANG" in RESETCOLORS="Przywróć domyślne kolory" AREYOUSURE="Czy aby napewno?" _COLORIZER_ROOT="Colorizer - menu główne" + LEFTSIDEPANEL="Lewy panel boczny" ;; *) COLORIZECONKY="Conky Manager" @@ -181,6 +182,7 @@ case "$LANG" in RESETCOLORS="Restore default colors" AREYOUSURE="Are you sure?" _COLORIZER_ROOT="Colorizer rootmenu" + LEFTSIDEPANEL="Left Sidepanel" ;; esac @@ -477,6 +479,7 @@ 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) diff --git a/bin/colorizer-fonts b/bin/colorizer-fonts index a5933d3..9879c7d 100755 --- a/bin/colorizer-fonts +++ b/bin/colorizer-fonts @@ -1,7 +1,7 @@ #!/bin/bash # # colorizer - set of tools for Mabox (auto)theming -# Copyright (C) 2022-2023 Daniel Napora +# Copyright (C) 2022-2024 Daniel Napora # # 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 diff --git a/bin/conkyctl b/bin/conkyctl index ac7f4fe..67ca023 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -1020,7 +1020,9 @@ 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" @@ -1031,7 +1033,7 @@ cmdmenu () { # otherwise build and show standalone menu with custom commands - sleep .2 + sleep .1 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%:*} @@ -1378,7 +1380,7 @@ case "$1" in toggleone) toggleone "$2";; restartone) restartone "$2";; contextmenu) contextmenu;; - cmdmenu) cmdmenu;; + cmdmenu) cmdmenu "$2";; cmdmenu_edit) cmdmenu_edit "$2";; makemoveableall) makemoveableall;; saveposall) saveposall;; diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index 47398ca..8c417c2 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -135,7 +135,7 @@ h5 {font-size: 2vw !important;border-bottom: 1px solid;padding-left: 1em;}
-

 Wallpaper...

+

 Wallpaper...

dynamic menus:

 Colorizer
diff --git a/share/mabox-colorizer/help/pl.html b/share/mabox-colorizer/help/pl.html index c89b989..da8f683 100644 --- a/share/mabox-colorizer/help/pl.html +++ b/share/mabox-colorizer/help/pl.html @@ -136,7 +136,7 @@ h5 {font-size: 2vw !important;border-bottom: 1px solid;padding-left: 1em;}