diff --git a/bin/colorizer-conky b/bin/colorizer-conky index 1f799f8..efa6682 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -31,11 +31,13 @@ fi case "$LANG" in pl*) COLORIZECONKY="Conky Colorizer" + NO_CONKY_RUNNING="Brak uruchomionych Conky" + RUN_CONKY_SESSION="Uruchom zapisaną sesję" MOVEABLEALL="Ustaw wszystkie (przeciągaj)..." GENERATEFROMWP="Generuj z kolorów tapety" LIGHTBG="Jasne tło" DARKBG="Ciemne tło" - GLOBALSETTINGS="Ustawienia globalne (zmień dla wszystkich)" + GLOBALSETTINGS="Ustawienia globalne (dla wszystkich)" REGENERATE="Motywy kolorów" OPENTHEMEDIR="Otwórz katalog motywów" APPLY_THEME="Zastosuj motyw" @@ -57,7 +59,8 @@ case "$LANG" in BORDERS="Obramowanie" STIPPLED_BORDERS="Nakrapiane" SOLID_LINE="linia ciągła" - INDSETTINGS="Ustawiania indywidualne" + RUNNING_CONKIES="Uruchomione Conky" + STOP_ALL="Zatrzymaj wszystkie" MORECONKIES="Więcej Conky..." CLICKTOSTART="Kliknij aby uruchomić" STARTALL="Uruchom wszystkie" @@ -68,11 +71,13 @@ case "$LANG" in ;; *) COLORIZECONKY="Colorize Conky" + NO_CONKY_RUNNING="No Conky running" + RUN_CONKY_SESSION="Run Conky session" MOVEABLEALL="Make moveable all..." GENERATEFROMWP="Generate from wallpaper colors" LIGHTBG="Light Background" DARKBG="Dark Background" - GLOBALSETTINGS="Global settings (apply to all)" + GLOBALSETTINGS="Global settings (apply to all)" REGENERATE="Color schemes" OPENTHEMEDIR="Open schemes dir" APPLY_THEME="Apply colorscheme" @@ -94,7 +99,8 @@ case "$LANG" in BORDERS="Borders" STIPPLED_BORDERS="Stippled borders" SOLID_LINE="solid line" - INDSETTINGS="Individual settings" + RUNNING_CONKIES="Running Conkys" + STOP_ALL="Stop All" MORECONKIES="More Conkies Available" CLICKTOSTART="click to start" STARTALL="Start all" @@ -138,7 +144,53 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then out+=("^sep($COLORIZECONKY)") out+=(" $MOVEABLEALL,conkyctl makemoveableall") - out+=("^sep($GLOBALSETTINGS)") + + #while read -r pid b c confpath + #do + # filename=${confpath##*/} + # name=${filename%%_mb*} + # out+=("${name^},^pipe(conkyctl single ${confpath})") + #done < <(pgrep -af "conky.*mbcolor") + + # array with running conkies - only filenames with full path + readarray -t running < <(pgrep -af "conky -c.*mbcolor" | cut -d' ' -f4) + + #array with all supported conkies + for i in "$CONKYDIR"/*_mbcolor*; do + supported+=("$i") + done + + #array with not started conkies + notstarted=($(echo ${running[@]} ${supported[@]} | tr ' ' '\n' | sort | uniq -u)) + + if [[ ${#running[@]} > 0 ]];then + out+=("^sep($RUNNING_CONKIES)") + for c in ${running[@]};do + filename=${c##*/} + name=${filename%%_mb*} + title=${name//_/ } + out+=("${title^},^pipe(conkyctl single ${c})") + done + out+=("^sep()") + out+=("$STOP_ALL (${#running[@]}),conky_toggle;sleep .5;$me") + if [[ ${#notstarted[@]} > 0 ]];then + out+=("^sep($MORECONKIES)") + out+=("^sep($CLICKTOSTART)") + for c in ${notstarted[@]};do + filename=${c##*/} + name=${filename%%_mb*} + title=${name//_/ } + out+=("${title^},conkyctl startone ${c};$me") + done + if [[ ${#notstarted[@]} > 1 ]];then + out+=("^sep()") + out+=("$STARTALL (${#notstarted[@]}),conkyctl startall;$me") + fi + fi + fi + + #GLOBAL START + out+=("^sep($GLOBALSETTINGS)") out+=(" $REGENERATE,^checkout(regenconky)") out2+=("^tag(regenconky)") out2+=("^sep($REGENERATE)") @@ -204,59 +256,27 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then out2+=("3,conkyctl stippled_borders_all 3;$me") out2+=("4,conkyctl stippled_borders_all 4;$me") - #while read -r pid b c confpath - #do - # filename=${confpath##*/} - # name=${filename%%_mb*} - # out+=("${name^},^pipe(conkyctl single ${confpath})") - #done < <(pgrep -af "conky.*mbcolor") - - # array with running conkies - only filenames with full path - readarray -t running < <(pgrep -af "conky -c.*mbcolor" | cut -d' ' -f4) - #array with all supported conkies - for i in "$CONKYDIR"/*_mbcolor*; do - supported+=("$i") - done - - #array with not started conkies - notstarted=($(echo ${running[@]} ${supported[@]} | tr ' ' '\n' | sort | uniq -u)) - - if [[ ${#running[@]} > 0 ]];then - out+=("^sep($INDSETTINGS)") - for c in ${running[@]};do - filename=${c##*/} - name=${filename%%_mb*} - title=${name//_/ } - out+=("${title^},^pipe(conkyctl single ${c})") - done - if [[ ${#notstarted[@]} > 0 ]];then - out+=("^sep($MORECONKIES)") - out+=("^sep($CLICKTOSTART)") - for c in ${notstarted[@]};do - filename=${c##*/} - name=${filename%%_mb*} - title=${name//_/ } - out+=("${title^},conkyctl startone ${c};$me") - done - if [[ ${#notstarted[@]} > 1 ]];then - out+=("^sep()") - out+=("$STARTALL (${#notstarted[@]}),conkyctl startall;$me") - fi - fi - fi out+=("^sep($RESET)") out+=(" $RESETCOLORS,^checkout(resetcolors)") - out+=(" $RESETALL,^checkout(resetall)") - out2+=("^tag(resetall)") - out2+=("^sep($AREYOUSURE)") - out2+=("$YES,rm $BASECONKY;$me") out2+=("^tag(resetcolors)") out2+=("^sep($AREYOUSURE)") out2+=("$YES,conkyctl resetcolorsall;$me") + #out+=(" $RESETALL,^checkout(resetall)") NOT SAFE!!! + #out2+=("^tag(resetall)") + #out2+=("^sep($AREYOUSURE)") + #out2+=("$YES,rm $BASECONKY;$me") else - out+=("^sep(No supported Conky running)") + out+=("^sep($NO_CONKY_RUNNING)") + SESSIONFILE=$HOME/.config/conky/conky-sessionfile + if [ -f "$SESSIONFILE" ];then + read N REST <<< $(wc -l "${SESSIONFILE}") + if [[ "$N" -gt "0" ]];then + out+=("$RUN_CONKY_SESSION ($N Conky),conky_toggle;$me") + fi + fi + out+=("^sep($CLICKTOSTART)") for confpath in "$CONKYDIR"/*_mb*; do diff --git a/bin/conkyctl b/bin/conkyctl index 5e5d584..8d977d5 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -261,21 +261,21 @@ makemoveableall () { case "$LANG" in pl*) TITLE="Przenieś Conky dokąd chcesz" - DESC="Możesz teraz przesuwać wszystkie Conky.\nPrzytrzymaj wciśnięty klawisz Alt i przesuń każde Conky gdzie chcesz\n " + DESC="Możesz teraz przesuwać wszystkie Conky.\nPrzytrzymaj wciśnięty klawisz Alt lub Ctrl i przesuń każde Conky gdzie chcesz\n " VB="To prawdopodobnie nie zadziała w środowiskach wirtualnych" CANCEL="Anuluj" SAVE="Zapisz nowe pozycje" ;; es*) TITLE="Move Conkies where you want" - DESC="Move Conkies to desired locations now...\n Hold Alt and drag Conkies one by one.\n" + DESC="Move Conkies to desired locations now...\n Hold Alt or Ctrl and drag Conkies one by one.\n" VB="It will probably not work in Virtual environments" CANCEL="Cancel" SAVE="Save new positions" ;; *) TITLE="Move Conkies where you want" - DESC="Move Conkies to desired locations now...\n Hold Alt and drag Conkies one by one.\n" + DESC="Move Conkies to desired locations now...\n Hold Alt or Ctrl and drag Conkies one by one.\n" VB="It will probably not work in Virtual environments" CANCEL="Cancel" SAVE="Save new positions" diff --git a/share/applications/colorizer-menu.desktop b/share/applications/colorizer-menu.desktop new file mode 100644 index 0000000..31f2d60 --- /dev/null +++ b/share/applications/colorizer-menu.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Colorizer Menu +Comment=Mabox Colorizer +Keywords= +StartupNotify=false +Icon=colorizer +TryExec=colorizer -s +Exec=colorizer -s +Categories=Settings; +#NoDisplay=true diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index 10d0521..048f2c6 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -30,6 +30,19 @@ a.w3-tag {color: transparent; border:1px solid #666666; margin-bottom:4px;} a.w3-tag:hover {color: transparent; border:1px solid #EEEEEE;margin-bottom:4px;} p a.w3-tag {text-decoration:none; border:none;} p a.w3-tag:hover {text-decoration:none; border:none;} +kbd { + background-color: #eee; + border-radius: 3px; + border: 1px solid #b4b4b4; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 2px 0 0 rgba(255, 255, 255, 0.7) inset; + color: #333; + display: inline-block; + font-size: 0.85em; + font-weight: 700; + line-height: 1; + padding: 2px 4px; + white-space: nowrap; +} @@ -330,28 +343,28 @@ p a.w3-tag:hover {text-decoration:none; border:none;}

Conky

-

Mabox provides nine Conky configs that you can easily customize with the Colorizer Conky module.

-

You can easily set up: +

Mabox provides several Conky configurations. Use  Conky menu to test and select which ones to run.

+

Conky in Mabox have been equipped with additional powers...

+

Click right mouse button on any Conky and you'll see a context menu. It allows you to conveniently:

-

-

Global settings allow you to change all Conky at once.

+
  • set screen position
    • +
  • manually change the background color or make it transparent
    • +
  • set text colors, borders, shadow or outline effects
    • +
  • apply one of the ready-made color themes for the selected Conky - or for all
    • +
  • disable (kill), reload or edit Conky
    • + +You can add your own commands to each Conky, which will be shown in the left mouse click (check the logo). +

    -

    Individual settings allow you to tweak individual Conkies, which can be very convenient to fit some wallpapers.

    -

    NEW! Context menu for individual Conkies

    -

    Mabox delivers Conky on steroids ;)

    -

    For each individual Conky there is a context menu (right click).

    -

    The context menu offers interesting possibilities: -

    +
    Tips
    + +
    +

    Super + C - toggle Conky - start/stop Conky session

    +
    +
    +

    Quickly place Conky on screen

    +

    To quickly arrange Conky to your liking, hold down the Ctrl key and click any Conky. You can now drag Conky anywhere on your desktop.

    +