Changeset 1999


Ignore:
Timestamp:
Jun 23, 2016, 1:59:19 PM (3 years ago)
Author:
daduve
Message:

Adding new mode dock to fix bug in desktop

Location:
lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_admins

    r1982 r1999  
    1010own_window yes
    1111own_window_class Conky
    12 own_window_type desktop
     12own_window_type dock
    1313#own_window_transparent yes
    1414#own_window_colour grey
    … …  
    136136template8  MIRROR \1:${exec cat /tmp/mirror_version.txt | grep 'VERSION \1' | cut -d ":" -f2 | xargs}
    137137template9  MIRROR DUAL:${exec cat /tmp/mirror_version.txt | grep 'VERSION 32' | cut -d ":" -f2 | xargs} default_color white
    138 template0 ${font AvantGardeLTMedium:bold:size=10}${color dodgerblue3}\1 ${hr 2}$color${font}${voffset 1}
     138template0 ${font AvantGardeLTMedium:bold:size=10}${color dodgerblue3}\1 ${hr 2}${color white}${font}${voffset 1}
    139139TEXT
    140 $color${font}${font AvantGardeLTMedium::size=38}$alignc${time %H:%M}$font$color${font AvantGardeLTMedium:size=15}
    141 $alignc${time %a}, ${time %d %b %Y}$font$color
     140${color white}${font}${font AvantGardeLTMedium::size=38}$alignc${time %H:%M}$font${color white}${font AvantGardeLTMedium:size=15}
     141$alignc${time %a}, ${time %d %b %Y}$font${color white}
    142142
    143143${template0 DATOS}
    … …  
    146146CLIENTE: ${if_match ${exec grep "server" /tmp/conky-test.txt -c}!=0}${if_empty ${exec echo $DISPLAY | cut -d ":" -f 1}}Servidor${else}Ligero${endif}${else}${if_match ${exec grep "client" /tmp/conky-test.txt -c}!=0}${if_empty ${exec cat /tmp/conky-test-fat.txt | grep true }}Pesado${else}Semiligero${endif}${else}Escritorio${endif}${endif}
    147147ARQUITECTURA: ${if_match ${exec grep "x86_64" /tmp/architecture.txt -c}!=0}64 Bits${else}32 Bits${endif}
    148 VERSIÓN: ${exec lliurex-version | awk -F ',' '{print $3}'}
     148VERSIÓN:${exec lliurex-version | awk -F ',' '{print $3}'}
    149149${template0 SISTEMA}
    150150Kernel $alignr $kernel
    … …  
    154154$cpu % ${cpubar}
    155155${template0 RAM}
    156 Uso de RAM: $mem/$memmax
    157 $memperc% $membar
    158 Uso de SWAP:$swap/$swapmax
    159 $swapperc% ${swapbar}
    160 ${template7 eth0 ETH0}${template7 wlan0 WLAN0}
    161 ${template7 eth1 ETH1}${template7 wlan0+1 WLAN0+1}
     156Uso de RAM: $memperc% $alignr $memmax
     157Uso de SWAP: $swapperc% $alignr $swapmax
     158${template7 eth0 ETH0}
     159${template7 eth1 ETH1}
    162160${template0 Disco Duro}
    163161${if_mounted /}${template1 /}${if_match ${fs_used_perc /}>=91}${execi 1000 /usr/share/lliurex-conky/hdd_full}${else}${endif}$endif

  • lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_admins_base

    r1976 r1999  
    1010own_window yes
    1111own_window_class Conky
    12 own_window_type desktop
     12own_window_type dock
    1313#own_window_transparent yes
    1414#own_window_colour grey

  • lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_gui

    r1982 r1999  
    1111CONKYRC_USED=$FILE_PATH/conkyrc_used
    1212
    13 TEXT_COLOUR="white"
     13
     14SELECTION_COLOUR2="dodgerblue3"
     15SELECTION_COLOUR="white"
     16SELECTION_COLOUR_DEFECT="white"
     17SELECTION_COLOUR2_DEFECT="dodgerblue3"
    1418READED=TRUE
    1519
    … …  
    355359        else
    356360                if [[ $SOY = "CLIENTE" ]]; then
    357                         SELECTION_COLOUR="white"
     361                        SELECTION_COLOUR="$SELECTION_COLOUR_DEFECT"
    358362                else
    359                         SELECTION_COLOUR2="dodgerblue3"
    360                         SELECTION_COLOUR="white"
     363                        SELECTION_COLOUR2="$SELECTION_COLOUR2_DEFECT"
     364                        SELECTION_COLOUR="$SELECTION_COLOUR_DEFECT"
    361365                fi
    362366               
    … …  
    383387        ##DETERMINAMOS LOS COLORES DE LAS FUENTES
    384388        echo ' default_color '$SELECTION_COLOUR' ' >> $CONKYRC_USED
    385         echo 'template0 ${font AvantGardeLTMedium:bold:size=10}${color '$SELECTION_COLOUR2'}\1 ${hr 2}$color${font}${voffset 1}' >>  $CONKYRC_USED
     389        echo 'template0 ${font AvantGardeLTMedium:bold:size=10}${color '$SELECTION_COLOUR2'}\1 ${hr 2}${color '$SELECTION_COLOUR'}${font}${voffset 1}' >>  $CONKYRC_USED
    386390       
    387391        #FONDO TRANSPARENTE O NO
    … …  
    390394        ##COMIENZA LA CONFIGURACION
    391395        echo "TEXT" >>  $CONKYRC_USED
    392         if [[ $SELECTION == *HORA* ]] ; then echo '$color${font}${font AvantGardeLTMedium::size=38}$alignc${time %H:%M}$font$color${font AvantGardeLTMedium:size=15}' >> $CONKYRC_USED;fi
    393         if [[ $SELECTION == *DIA* ]] ; then echo '$alignc${time %a}, ${time %d %b %Y}$font$color' >> $CONKYRC_USED; echo '' >> $CONKYRC_USED; fi
     396        if [[ $SELECTION == *HORA* ]] ; then echo '${color '$SELECTION_COLOUR'}${font}${font AvantGardeLTMedium::size=38}$alignc${time %H:%M}$font${color '$SELECTION_COLOUR'}${font AvantGardeLTMedium:size=15}' >> $CONKYRC_USED;fi
     397        if [[ $SELECTION == *DIA* ]] ; then echo '$alignc${time %a}, ${time %d %b %Y}$font${color '$SELECTION_COLOUR'}' >> $CONKYRC_USED; echo '' >> $CONKYRC_USED; fi
    394398               
    395399        ####DATOS INICIALES####
    … …  
    425429        if [[ $SELECTION == *IP_ADDRESS* ]] && [[ $SELECTION == *NET_DOWNLOAD* ]] && [[ $SELECTION == *NET_UPLOAD* ]] ;  then
    426430                index=0
    427                 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' );
     431                for i in $( ifconfig | grep 'Ethernet' | grep -v ':42' | awk '{print $1}' );
    428432                do
    429433                        NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' )
    430                         echo '${template3 '$i' '$NET_TITLE'}${template3 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED;
    431                         index=$index+1
     434                        echo '${template3 '$i' '$NET_TITLE'}${template4 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED;
     435                        index=$((index+1))
    432436                done
    433437       
    434438        elif [[ $SELECTION == *NET_DOWNLOAD* ]] ;  then
    435439                index=0
    436                 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' );
     440                for i in $( ifconfig | grep 'Ethernet' | grep -v ':42' | awk '{print $1}' );
    437441                do
    438442                        NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' )
    439443                        echo '${template5 '$i' '$NET_TITLE'}${template5 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED;
    440                         index=$index+1
     444                        index=$((index+1))
    441445                done
    442446               
    443447        elif [[ $SELECTION == *NET_UPLOAD* ]] ;  then
    444448                index=0
    445                 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' );
     449                for i in $( ifconfig | grep 'Ethernet' | grep -v ':42' | awk '{print $1}' );
    446450                do
    447451                        NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' )
    448452                        echo '${template6 '$i' '$NET_TITLE'}${template6 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED;
    449                         index=$index+1
     453                        index=$((index+1))
    450454                done
    451455        elif [[ $SELECTION == *IP_ADDRESS* ]] ;  then
    452456                index=0
    453                 for i in $( ifconfig | grep 'Ethernet' | awk '{print $1}' );
     457                for i in $( ifconfig | grep 'Ethernet' | grep -v ':42' | awk '{print $1}' );
    454458                do
    455459                        NET_TITLE=$( echo "$i" | tr '[:lower:]' '[:upper:]' )
    456                         echo '${template7 '$i' '$NET_TITLE'}${template7 wlan'$index' WLAN'$index'}' >> $CONKYRC_USED;
    457                         index=$index+1
     460                        echo '${template7 '$i' '$NET_TITLE'}' >> $CONKYRC_USED;
     461                        index=$((index+1))
    458462                done
    459463        fi
    … …  
    490494        if [[ $SELECTION == *CLIENTE* ]] ; then echo ''$MSG_CLIENT': ${if_match ${exec grep "server" /tmp/conky-test.txt -c}!=0}${if_empty ${exec echo $DISPLAY | cut -d ":" -f 1}}'$MSG_SERVER_PANEL'${else}'$MSG_LIGERO_PANEL'${endif}${else}${if_match ${exec grep "client" /tmp/conky-test.txt -c}!=0}${if_empty ${exec cat /tmp/conky-test-fat.txt | grep true }}'$MSG_PESADO_PANEL'${else}'$MSG_SEMILIGERO_PANEL'${endif}${else}'$MSG_DESKTOP_PANEL'${endif}${endif}' >> $CONKYRC_USED;fi
    491495        if [[ $SELECTION == *ARQUITECTURA* ]] ; then echo ''$MSG_ARCHITECTURE': ${if_match ${exec grep "x86_64" /tmp/architecture.txt -c}!=0}64 Bits${else}32 Bits${endif}' >> $CONKYRC_USED;fi
    492         if [[ $SELECTION == *VERSION* ]] ; then echo ''$MSG_VERSION':${exec lliurex-version | awk -F '\',\'' '\'{print \$3}\''}' >> $CONKYRC_USED;fi
     496        if [[ $SELECTION == *VERSION* ]] ; then echo ''$MSG_VERSION': ${if_existing /usr/share/lliurex-cdd/version}${exec cat /usr/share/lliurex-cdd/version}${endif}' >> $CONKYRC_USED;fi
    493497        if [[ $SELECTION == *IP_ADDRESS* ]] ;  then echo '$hr${template1 eth0 ETH0}${template1 eth1 ETH1}${template1 eth2 ETH2}${template1 eth3 ETH3}${template1 eth4 ETH4}'>> $CONKYRC_USED;fi
    494498        echo '$hr' >> $CONKYRC_USED
Note: See TracChangeset for help on using the changeset viewer.