master
Daniel Napora 2020-09-01 19:24:09 +02:00
parent 8449da5ff7
commit a4a6218460
2 changed files with 9 additions and 2 deletions

View File

@ -50,7 +50,7 @@ case $LANG in
EDIT_CONKY="Edytuj Conky" EDIT_CONKY="Edytuj Conky"
CONKY_EDITOR="Wybierz plik Conky do edycji..." CONKY_EDITOR="Wybierz plik Conky do edycji..."
NONE="Brak" NONE="Brak"
;; DEFAULT="Domyślna";;
es*) es*)
CHOOSE_CONKY="Elegir recuadro Conky" CHOOSE_CONKY="Elegir recuadro Conky"
NEW_SESSION="Guardar sesión actual Conky" NEW_SESSION="Guardar sesión actual Conky"
@ -61,6 +61,7 @@ case $LANG in
EDIT_CONKY="Edición manual recuadro" EDIT_CONKY="Edición manual recuadro"
CONKY_EDITOR="Editor de recuadro" CONKY_EDITOR="Editor de recuadro"
NONE="Ninguno" NONE="Ninguno"
DEFAULT="Default"
;; ;;
*) *)
CHOOSE_CONKY="Choose Conky" CHOOSE_CONKY="Choose Conky"
@ -72,12 +73,14 @@ case $LANG in
EDIT_CONKY="Edit Conky" EDIT_CONKY="Edit Conky"
CONKY_EDITOR="Conky Editor" CONKY_EDITOR="Conky Editor"
NONE="None" NONE="None"
DEFAULT="Default"
;; ;;
esac esac
getSessions(){ # read any saved sessions from save-sessions file getSessions(){ # read any saved sessions from save-sessions file
menuItem "Default" "$CSESSION $CSESSIONFILE" menuSeparator "$SAVED_SESSIONS"
menuItem "$DEFAULT" "$CSESSION $CSESSIONFILE"
if [ -e "$SESSIONS" ] if [ -e "$SESSIONS" ]
then then
while read -r session ;do while read -r session ;do
@ -126,6 +129,7 @@ loadEditMenu(){
menuItem "$DEFAULT_CONKYRC" "geany $CONKYDEFAULT" menuItem "$DEFAULT_CONKYRC" "geany $CONKYDEFAULT"
if [[ $(pidof conky) ]];then if [[ $(pidof conky) ]];then
menuSubmenu "RunningConky" "$RUNNING_CONKY" menuSubmenu "RunningConky" "$RUNNING_CONKY"
menuSeparator "$RUNNING_CONKY"
while read -r session ;do # get running conkys from sessionfile while read -r session ;do # get running conkys from sessionfile
[[ -z $session ]] && continue [[ -z $session ]] && continue
CPATH=$(echo "$session" | awk '{print $3}') CPATH=$(echo "$session" | awk '{print $3}')
@ -140,6 +144,7 @@ loadEditMenu(){
getConkys(){ getConkys(){
menuSubmenu "EditConky" "$EDIT_CONKY" menuSubmenu "EditConky" "$EDIT_CONKY"
menuSeparator "$EDIT_CONKY"
if type mb-conkyedit &>/dev/null;then # mb-conkyedit script found if type mb-conkyedit &>/dev/null;then # mb-conkyedit script found
menuItem "$CONKY_EDITOR" "mb-conkyedit" menuItem "$CONKY_EDITOR" "mb-conkyedit"
loadEditMenu loadEditMenu

View File

@ -63,6 +63,7 @@ loadTEditmenu(){
menuItem "$DEFAULT_TINT2RC" "geany $TINT2RC" menuItem "$DEFAULT_TINT2RC" "geany $TINT2RC"
if [ "$(pidof tint2)" ];then if [ "$(pidof tint2)" ];then
menuSubmenu "RunningTint2" "$RUNNING_TINT2" menuSubmenu "RunningTint2" "$RUNNING_TINT2"
menuSeparator "$RUNNING_TINT2"
pgrep -a tint2 | while read -r pid cmd; do pgrep -a tint2 | while read -r pid cmd; do
if [[ ${cmd%% *} = tint2 ]]; then if [[ ${cmd%% *} = tint2 ]]; then
TINT=${cmd##* } TINT=${cmd##* }
@ -80,6 +81,7 @@ loadTEditmenu(){
getTint2s(){ getTint2s(){
menuSubmenu "EditTint2" "$EDIT_TINT2" menuSubmenu "EditTint2" "$EDIT_TINT2"
menuSeparator "$EDIT_TINT2"
menuItem "$TINT2_EDITOR_GUI" "tint2conf" menuItem "$TINT2_EDITOR_GUI" "tint2conf"
if type mb-tint2edit &>/dev/null;then # mb-tint2edit script found if type mb-tint2edit &>/dev/null;then # mb-tint2edit script found
menuItem "$TINT2_EDITOR" "mb-tint2edit" menuItem "$TINT2_EDITOR" "mb-tint2edit"