changes related to temperature and layout

diff --git a/data/box.lua b/data/box.lua
index dd95c27..60acc17 100644 (file)
--- a/data/box.lua
+++ b/data/box.lua
@@ -54,19 +54,19 @@ table_settings={
         radius=20,
     },
     {   
-        x=610,
+        x=584,
         y=100,
         h=86,
-        w=240,
+        w=270,
         linear_gradient = {300,200,550,350},
         colour = {{0,0x000000,0.2},{1,0x000000,0.1}},
         radius=20,
     },
     {   
-        x=350,
+        x=314,
         y=100,
         h=86,
-        w=250,
+        w=270,
         linear_gradient = {300,200,550,350},
         colour = {{0,0x000000,0.2},{1,0x000000,0.1}},
         radius=20,

diff --git a/data/graph.lua b/data/graph.lua
index 055e11b..512b203 100644 (file)
--- a/data/graph.lua
+++ b/data/graph.lua
@@ -207,7 +207,7 @@ function set_settings()
                        arg="mmcblk0}",
                        max=2500000,
                        y=183,
-                       x=349,
+                       x=324,
                        autoscale=true,
                        width=250,
                        height=89,
@@ -225,7 +225,7 @@ function set_settings()
                        arg="",
                        max=500,
                        y=183,
-                       x=593,
+                       x=594,
                        autoscale=true,
                        width=250,
                        height=85,

diff --git a/debian/changelog b/debian/changelog
index 75da865..ce59ae0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 conky (2.0.2-1) unstable; urgency=low
 
-  * got temperature working again
+  * got temperature working again by talking to bme directly
+  * added new variable ${battery_rate} to get charge/discharge rate
 
  -- Lance Colton <lance.colton@gmail.com>  Thu, 08 Mar 2012 00:45:00 -0700
 

diff --git a/debian/conky.desktop b/debian/conky.desktop
index 4021fe0..04b8a5a 100644 (file)
--- a/debian/conky.desktop
+++ b/debian/conky.desktop
@@ -2,6 +2,6 @@
 Version=1.0
 Encoding=UTF-8
 Name=Conky
-Icon=conky
+Icon=/usr/share/themes/base/meegotouch/icons/conky.png
 Exec=/usr/bin/conky.sh
 Type=Application

diff --git a/debian/conkylogo48.png b/debian/conkylogo48.png
deleted file mode 100644 (file)
index bf28bca..0000000
Binary files a/debian/conkylogo48.png and /dev/null differ

diff --git a/debian/conkylogo64.png b/debian/conkylogo64.png
index a336c38..956c939 100644 (file)
Binary files a/debian/conkylogo64.png and b/debian/conkylogo64.png differ

diff --git a/debian/conkylogo80.png b/debian/conkylogo80.png
new file mode 100644 (file)
index 0000000..3909221
Binary files /dev/null and b/debian/conkylogo80.png differ

diff --git a/debian/control b/debian/control
index 810c533..bb8d76b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -31,9 +31,9 @@ Description: Highly configurable system monitor
  .
  This is a full Conky with most compile options enabled, but since
  you are running on a phone and this software is not really for phones
- there are a few problems. Nokia cut some corners in the kernel that makes
- the diskio stats less detailed and X11 is not able to double buffer.
- Probably this will get fixed very soon but I cannot guarantee it. 
+ there are a few things like diskio stats currently not working
+ due to kernel limitations.
+ This will probably get fixed eventually, but I cannot guarantee it. 
  .
  Maemo6: This port for maemo6 is intended to be run as a standalone
  app. The default config has been reworked for suitability for the N9
@@ -47,124 +47,120 @@ Description: Highly configurable system monitor
 Xsbc-Bugtracker: https://bugs.maemo.org/enter_bug.cgi?product=conky
 XB-Maemo-Display-Name: Conky
 XB-Maemo-Icon-26:
- iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c
- 6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0
- SU1FB9kMEQ4zAV1CQhAAABScSURBVGjerZl5lGV1de8/+wx3rLq35q65u3qi
- m266GRsxKAiKCAkoYIw8o4Im8SlLYmJeEsUsjSzNMugzeUsxir6V4BMRQqQB
- ARtoZrppoYcquobumruqax5u3fEMv/3+uFVNN4FEhLvWWfd3fmfYe589fze8
- zT/fL+H7pRPnqppS1Y2qullVO1S1SlXjh//hpjd43sP3PQCCoEQQeARBeS8I
- vP90v7xdjAdBCceJvnpuwh1qwm8Vjg1sN6VCPFJVa+WH+3ynsqrgpmuDWNPq
- ABPOhIX8sbBUyFrRuNrxxC41eqfrRvyV9+TnpyReVR8XkXy2/wgV6za8vQKc
- zLhXyLpWJPY5hM+iuqE4MUp+4DBWPEG8dR2CRfbIQdQYTDGHj0Wsuo5EUztO
- ZRVuug7VcF7Evg+YVA3rgA+Vpsbr3XRNtxWNXeVYztG3LMBrv3Z5z/suIjcH
- 2UW8+RmSqzeqCXwsxxUQVYwIoiCoCQgLeYJcRub7DlGzYSvZ6ePqotiJSgkK
- WQQhuqqVMJvpdapqh9xU9R5Evu5YTvg2mYwnJ63vDQJPg8ALfL9kfL+kQeAZ
- 3y/pyrF8XU/ZM4F6XkHzx47oL//2Bh1+8n5VVfWKOeMVcmpUf3gyTVU9xb9+
- V8YJAs9aXl8VhP5Ly4wZ3y+Zkxg9sT75WLnvVUF9DVW1kJnX535ym84N9aiq
- mtz4YBiYQIPAe9cK3df7vWkTCkJfHNvVIPR3aODv9RfncCqr1HIjAKKqoAYQ
- FcsWGy1TUQU7AqChhmgYgqoggtg2ttgAjDz/KFZmVj0nyuqLrhSjui8STex4
- I36cN2P3qoJjuxqquQR41IRFTKmokrZEVbFsB1ussrpBpp64j5GRQWZnZ/B9
- j4bmNlo2bZOGjo1YqRrsaAKApf5O8kO9WNE4zee9h9xov/Q8ei+tZ12AW9vc
- 4qnaEZEwCDwcJ/LWNBCqnu8vzu7x56eJ1Depk0xjQk8s28UsztL15K+Y6TtE
- UzqlqXS1ZAsFugf6mZqdpTadJl1RoQ21dVSlUjipaknWNBBpbMOpbkADH7Fs
- ojWrNDfULfvu+oE2btshm668vlfE2vSWNHDCkUxwlRWN4VTVIrYjqiFBNkM4
- Mczuu+7AD3zecc0niFemyA/2MDW6j+pUmobaOuYyGUphyJ7OTpKJBJWJOKjS
- UldHTV09kXiSXKGIG4mQSFYwsbAo62obCEqFKlVFRN4OAUyH5UawIlE1vof6
- vrjRGId3PwQIV950C5HGNRiU9Ibt1G2/gMMP/JTp6SnmM4sEQQAo85lFsvkc
- qDIyMYFlCfXVNVSl0qyqrQWvyJb166lu6cCKJqZfj3kA680KICIJVYOIRWlq
- DDsSY6Fzr46MDOn5V1yjbuMaDQIPE/iY0MdZ1c62j39Bz7noMs5at05rKitJ
- xBNEHAdjDJYIruPg2I7OzM9r/8iwHuzpITRGqypTRNI1qIa/ectO7PslXDcK
- 8D2x7KuLk6OysP9ZEukaRnsOSSweJ92xCaMGseyyf6nBBB5iO5J+5weIdZwu
- rf1dLB0bJJfP8sLBA/ihoTqVYimXF0WxxCJXyNPZ18v5mzejJkTE6nvLAqyo
- 0HEiu7xCdrQ4erRteuKYzv78dqmurqH2tM3YNasQsQiLS2DZakcTYgGKomFI
- tLGdeNMaTYc+/vEhvGhS9jz/FFMLC9Sk0hSKeUqej2+MLmQyUvA8dRIVoibc
- 9pYFODl8iRvNpLfuILfnKensOcy7zjmPpXwO+9e/wHIjhIUcYamIOA4mEqfu
- tO3E29Zi7DgGsG0Hu2kN7Zu3E/OLdA4OkojFWFfZRiabZXJulupEnPozLxAr
- EseE/sQbftg3m4UdJ4Lvlz5oifxH/wuPaffjD0jB97nwo3+GDHQSFguwrK0g
- CAgCn96jfdS3rGbj1rOwHJdjw/30HdxHe1MzLc1tWJZQKBYZn5qkqjLF8ekp
- crklkqvauOQzX/KMCc+zbefQ6+WBNxWFVh4uTYz+Otm6bjydTDYXigUuvP5/
- 0rLlXPy1m5h9/hHi8QR377xXD3UflnRFBWdu2MCjTz/BPQ8/SEUsqhWRCJGK
- FHY0IT5CS8MqLMuitbEJEUEE/U33DO+++P2iaixF42/Ek/W71EMVbevzwK5Y
- bRMLszNa07ZGQxNgRaJUn3MR6XdeQUNjKx2VSSImpLGmjtUNq2irrSEWjRJN
- pRmbmuClrkM88OQT+KUSoVfCGENoDKmKSjav3yQTwwPkZyZztuUMv9aMf+dM
- 7PserhvBU7VcuPfggz/7UN7z9IJrPkkY+oIIiEU4P6V9+56V5uZWup/8FUeH
- B/jA71/HaF+XHjnay5aLLmfsaK9Eauo5d/vZ5GenqDnvPUw/tZNwaUHvf/YZ
- 88df+Y5dtartgyJy/+uZz+/cMgbBKS3jzlcevVenXtmnYeAZo2pCVVVVo6ra
- /fSv9IFbP2+Kc5PlvaBknv/BrebR733drNxp9MQDZuCuf/Z3feuLOjPcp6r6
- LQC/lD+F5tvQ0HgA4jgRzeezjfF4ctzLzElxagxvegwrEkPDgOzxEcaPHObs
- T/8v3KoG1IRYlo0/e5zuf7+D4dl52refT8fmM1QCX/yFGfKFIrHVG++uX73h
- 70Xk8Mlaf9sEWElqQeBFHCfiBYE3ZdlufeH4EJO/vhsrGscWUYknJVbXRHF6
- nLBUwKmoItbUrvG29Sy+9BTBwowoEBTzWn3OxZLaev6PbZFPv17ke8t54D/3
- BYGTHxn0AUwYVmXnpgkW5nCrGwgLOQZHhzjt6k9Qu+EMAHLHhwnzS8RbOrBj
- SRre/1HGH7oTszijTmWVxJpX715h/mSm/zu7lzfjvCKnvlBVXeCupf7Oawcf
- vpt5A5Uta1llCmjjao52vkw2l2fttnNo2bSdWHUt6nt42SWKEyMYNSQrqzBu
- hPTGM88SkQMnlSy/XYXwWzFuiTi2q8tMNwHXl+Ym/8ibnz53rvslxvr7dNtl
- H+SRnfeKn81w8dbNVP7eFVrRul6GX3qasd88TWFuBlugpW2NptrXE1uziUzX
- izI+Ncm5V300a1c3NohI4bXR7r/NTW/kpKqK60ZXXqKqen4YBl9ZOnrovfnh
- 3qjmlhgZPOrPZbNORfNqqWhup71xFQ/t2s+7t2xGfY8gDGhoXUPb1nOxBNQo
- oSp2vIIgn8HedCY7d/2DFjPzFXVbd/wjcBPA7MBhcd2I/lbJ9fUcdMVMVHUz
- 8LHi3MTVi117tmSOdBLms0wvLmq2UGDg2Khjq5EPXfsJ5vt7aXQtNra20jd2
- jK19B0h2bMKKJZje+xhi2zjJFMm1pyPROG4iRc/4OEf7j5Ag1MO93Z975ie3
- dVx4w1/+mYgcA8gc6ye+qvW/NCnnZJVZTrm5VtUm3y/9qzc1+r7swGGKx4eZ
- nBjXSCwug2Nj9I8M4xsjiKVh4LM0Mabh8QHsZIrL/uA6dj1wr7ROjhP++hck
- Nmwn2bZeTeCLk6pWjC6X24ZHf3YHzU3NUhGPa8bz9Kf33X1FIZ8f9eennnGq
- 6q8Tkan8cK+EGmKLrf+lACKcQAYUHs++tHvzK8/sCuZzBdtyXBmfmhDXccgW
- CiRiMVkoFKhJJGQ2u0RmsEfS6TSJjs28/OBdRCIuXQMDcn6ygmOP34clIvFo
- FFUVt6qO6nMvYvT5XXT1HOarf30LnS88KVERCsboLx99IJw/Pvqucz9w7Yiq
- fgO4VUQMQHFxFjtReYpvWCebjapafjH38szu+zY///Av9YWeXufI2DF57pVO
- jkxNaf/UFPOFAn4Y6sjcHAMz03pkYoL9o8doOO9iBl94DONG2NfTQ8nzdC6b
- JVaRpqKqBnEj2PEkbrpWg8y8OolK/cC5ZzNwaB/v+8iNpKqqidm2lBCna2hQ
- H/m370f//euf/9rgi7tDDb17VHVrLF2L60ZOwYicwCvivGpj/zr53CNn7d31
- QPjy0LA1tpTBEgs/LKN5xiiN6RQTmQyqymQmg4rQ9Uon7ziwh+nMEg88+wzv
- O+c84pEI1S1rkHiSVdsvgFgCEwaI7WA7EQQ4fXqC5154mjOXMqzduIWH9+4h
- Go0yPDdHVSLB5NioPvjD26T+wbuvO//9H7pOVb8hIl8+pTcxqlgiqOqWbO/L
- Xff/6Du8PDzCQqHIbKZAMu7i2BYziwW1LJHWukqC0OCHIZZYlNtAIRlNcun2
- rdTV1DA/PcV5F17C8NEentv3Am2tq3nvDTdTtWYTCuRHeiEzx8DBfRwb6ica
- cRnK5Nj59NMkolHiUZvKWIwNDaswxqhr24xNHDdXXf8p+7xrbvipiPzxKXlA
- VROZo52HcoeeXzdwbFQfeXGvDM3OMrtYKve4ImpM2U+iri0A6WQUzw81CI34
- oWF+Kc85G1bztS99ldS6LTz5k/+tPb3d0j83S+j7NKTSXHH9p0looMGxfvb3
- dHPp718n46NDHNi/j92v9HB8PkssYlMRi6jrikRtl1ANNckk2ZJHwoJbb797
- It7QullEFoLAW/aB3NI3C737103Pz5uR4+Oytr6OTY2NVKdi2Jal2XxJRESS
- sahkckW8INRc0dfFfIlc0adQCqiIR+kaHOXvvn0bx/a/wLGRIabzOWKOy9h8
- gad6B9h510+I5xd5qa+P2upatFRg7bqNhHaEock5RATPN8xkCiwueYRqEGAu
- lyNXLOlsLkfXs481AueslBmWqnbkj+y/cd9Le3nx4AFrfnGRsfkFjk5PE7Et
- DYyRdEWcL/zJjZ/58p//xVVrW5uCQsmTTN7DGEUELEsIjWI7LgdeOcwXvvK3
- TCwtkS36qApYShAKuzv7uOVffkRHWzvnbdvO5GAfJpmia/S4WpalJgwJlzHT
- ghfq2HRWM3mPhWwRVSU0Rvu6D4Lx3ruM0+IArSNHuiuODg+TDUMWi0Vms1kV
- wA+NaGh4145zn7j8U1/8l2Vza7/jb278zc7n9jYXvFBFy1aIlOHvWDTCXMGT
- Rw/2YBQsESwRtS0Ry3K0b3ya79y7k89dfQUbW1uYPbSXA7296jquddrqtuN1
- dXX79x/uviKbL4hlWZov+tSkY2pZQlOqnoHew4we3HfJclQRiyDrzU1PkfN9
- hufmmMvlAMS2LFkqeqSTcS5854XfPgleOR63ncXayjjFAuJ5ACoCgoioqri2
- hW3Z4to2tmUhIqIKqEplIi6LuYJ886575fadD+vug4dY21hr/eFllz75f36x
- a+tXb//5lZ/6yB/eVBmPYYxKuiJKTTIptckKWSwUpHOwPxgbG92hqmnHjaqF
- UzE9Oze7OLa4SGAMqoplCSU/wPNCQmNYWMq6J1WgycArNiYjcd5zia1r1xu8
- khCGEAav1oeqKFrOimjZ1ETKarJtSxVLn+7qlof2HOArn7/5z//k1u+/R0Tm
- AOuqz375e6d1dByKuhbxqEPB88iXSgoQjcVkaKAPYM1KIhuqSCZHKuPlxt8o
- +IFhfql0QpBSsZg+EXiL8w1e6CWDUPnw9QE3fBpq66Cl2WbbWQYRJQzKrTGi
- WLYiNoily+g25HKQTok0VSf55P9oHOu4/GP/BDDXu59PXXqGlE3ADixZHitY
- FjXJJIlIBBC1LAFYAnBExLzywJ2D4Z7nzlBQ2xIREaoqo0wvFDBhSD671HCC
- /6M9KUFcPww50hWTfS+FFLM2f//NIotLhtlJl/97h5LJILGIQ2AMlij5PDiO
- oa4qJhddG6BWoLvuF2lv33gnPMJC/61W1bqzTP0ynUIhX1nwQowpqzJbKkkp
- CIiooX39ZoCh2aNd5WnE+vMvPtxRX49r2xhVjIGoY9NYk1DXtVjMLJ62IoDx
- vXSm6IlvfB5/OKrvv9Knqi6gtyvCy/ssbFu48bMes9O2/vUthpv+ssj7LrX5
- q1t8lnJw4YW2XnfDgmayJWmorqM5ddXPAdJrv2wApiFU1ahXzNfWpOK4jkXc
- cUlEIhr6Pi1rNzpnv+Oix0XEVK87vZwHIvWtndvO2kFYKqkxBlCMKqpIyTMU
- ivmmEwKgQcS2sR2YnCnxd3/jMDFh+MHtBoIIySqPJx+zqa6BqQn43j9b3POz
- CLYlpGJRmjtyfPyDaZ7b7dLSUvvyqt+7tBug6876k5GH+sV8IRlzbUKjzOXz
- zOdylHxfm1vaiVTV7wYIA09XqtGJlo1bWFtTpeOF0rLahVIQUJFwKRQKdSdA
- rW1nT2aLJaOKFYvaVFQGhCEohnvuMfzs/7lEY+C6Id/9jhCJulQ1FPn+dx0k
- 4vHd2yyiMSOuFePMjRseEREP4IyPz8DHyzXZrh9/e4uqRiOujVL2AS8MCU0o
- sXgCoH8FcF5B5vY5yUoW8nkNTEhojIbGqCqqRsnmC1UnwqiT7q+trT9ojCHi
- 2sRcuxxxRDQaFU1WoI6jqEIsrtg2BKHRfB4ENBYvO3NlMs4ffOyT/wEw27nn
- lBq/u79/m+cHeEG4Evm0DDkKlRWVAJlyJo5i+V5RRGQplqjwbNuxip6Pqkpg
- jAiI49jkcrkGVa1YIXD6trN/HI+4+L6Rohciy3icsgxtipSTAoIqK4PI8jcT
- kdCENFSlF6lf3wlQe8Y7ThFgemZme75YJAgDisUCvueJUQVV1q3fNA48sdL6
- WmKVlWC7kd72pmYLFMeyUGNUNdSoKzi2qQaqVwhMDB65zhjFskQdu8xkeca6
- kizK441Xq8VX91VRYwztra09IlL6wc0ftV/bZdXV1R5vqEyytqGR0zZtp6Vt
- rRZzRb3yyms587JrbheR4gr04rBMvrKm7vl0Td0Zq6enyCMkk5VU1tZJ2nXY
- vH7Tl0RkdGVa/qO/+NgW17ZZKvp4gUEsORXjeO0/J11XlajrUF+/6iGAiy+/
- WvmnuwA4cM8POfPDf8rN37j9a3MvPvaZmnPeXbE8W5aJzhel8YwdXxSRb5vs
- ooTlNPlqSxmpXnWocf1mWk8/i1RtA3WrmqWuoZGol/83Z/Xmb548qfn+X93Q
- kyt59ZaUOQuDsGzgWhZwRSEnFicJZIzS3lBHU0vrkwCnXf4RA38EwJkf/lMA
- Zp57qCPvBcnsoReRZBWubWGZAOBlAKsifaI//v+bvGP4SNZflwAAAABJRU5E
- rkJggg==
+ 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

diff --git a/debian/icon.txt b/debian/icon.txt
new file mode 100644 (file)
index 0000000..9fedd8f
--- /dev/null
+++ b/debian/icon.txt
@@ -0,0 +1,117 @@
+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

diff --git a/debian/postinst b/debian/postinst
index abc2ec2..0efb5b8 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -20,18 +20,6 @@
 #      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 
-if [ -r /etc/osso-af-init/af-defines.sh ]; then
-  source /etc/osso-af-init/af-defines.sh
-fi
-
-if [ -x /usr/bin/dbus-send -a -x /usr/bin/gtk-update-icon-cache ]; then
-  dbus-send --type=method_call --dest=org.freedesktop.Notifications /org/freedesktop/Notifications org.freedesktop.Notifications.SystemNoteInfoprint string:"Updating icon cache" || true
-fi
-
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -f /usr/share/icons/hicolor || true
-fi
-
 case "$1" in
     configure)
         [ -z "$2" ] && \

diff --git a/debian/rules b/debian/rules
index 0ceae0b..055662a 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -97,10 +97,8 @@ install: build
        dh_clean -k 
 
        cd build-all && $(MAKE) install DESTDIR=$(CURDIR)/debian/conky-n950
-       mkdir -p debian/conky-n950/usr/share/icons/hicolor/scalable/apps/
-       cp -p debian/conkylogo64.png debian/conky-n950/usr/share/icons/hicolor/scalable/apps/conky.png
-       mkdir -p debian/conky-n950/usr/share/icons/hicolor/48x48/apps/
-       cp -p debian/conkylogo48.png debian/conky-n950/usr/share/icons/hicolor/48x48/apps/conky.png
+       mkdir -p debian/conky-n950/usr/share/themes/base/meegotouch/icons/
+       cp -p debian/conkylogo80.png debian/conky-n950/usr/share/themes/base/meegotouch/icons/conky.png
        mkdir -p debian/conky-n950/usr/share/applications/
        cp -p debian/conky.desktop debian/conky-n950/usr/share/applications/conky.desktop
        mkdir -p debian/conky-n950/usr/bin/

diff --git a/lua_scripts/text.lua b/lua_scripts/text.lua
index ad81b99..f8415b8 100644 (file)
--- a/lua_scripts/text.lua
+++ b/lua_scripts/text.lua
@@ -92,12 +92,23 @@ function conky_draw_text()
                                bold=true,
                                font_name="Nokia Pure",
                                h_align="r",
-                               x=800,
+                               x=850,
                                y=15,
                                reflection_alpha=0,
                                reflection_length=0,
                                colour={{0,col0,0.75},{1,colbg,0.75}},
-
+               },
+               {
+                               text="Conky v"..conky_parse("$conky_version").." - Lance Colton",
+                               font_size=16,
+                               bold=true,
+                               font_name="Nokia Pure",
+                               h_align="r",
+                               x=850,
+                               y=28,
+                               reflection_alpha=0,
+                               reflection_length=0,
+                               colour={{0,col0,0.75},{1,colbg,0.75}},
                }, 
                {
                                text=conky_parse("$freq MHz"),
@@ -115,7 +126,7 @@ function conky_draw_text()
                },
                {
                    text=conky_parse("${battery_temp}").."\194\176",--yes i had to do the degree symbol like that...
-                       x=794,
+                    x=845,
                    y=69,
                    v_align="m",
                    h_align="r",
@@ -125,10 +136,23 @@ function conky_draw_text()
                                orientation="nn",
                reflection_alpha=0,
                reflection_length=0,                    
-        }, 
+        },
+               {
+                   text=conky_parse("${battery_rate}mA"),
+                    x=750,
+                   y=69,
+                   v_align="m",
+                   h_align="l",
+                   font_name="Nokia Pure",
+                   font_size=14,
+                       colour={{0,col0,1},{0.5,colbg,1}},
+                               orientation="nn",
+               reflection_alpha=0,
+               reflection_length=0,                    
+        },
                {
-                   text=conky_parse("${battery_short} ${battery_volts}mV"),
-                       x=794,
+                   text=conky_parse("${battery_short}   ${battery_volts}mV"),
+                    x=845,
                    y=45,
                    v_align="m",
                    h_align="r",
@@ -153,7 +177,7 @@ function conky_draw_text()
         {
                    text=conky_parse('${cpu}').."%",
                        x=223,
-                   y=65,
+                   y=67,
                    v_align="t",
                    h_align="l",
                    font_name="Nokia Pure",
@@ -164,9 +188,9 @@ function conky_draw_text()
                reflection_length=0,                    
         },  
         {
-                   text=conky_parse('${memperc}').."%",
+                   text=conky_parse('${memperc}').."% RAM",
                    x=223,
-                   y=91,
+                   y=101,
                    v_align="t",
                    font_name="Nokia Pure",
                    font_size=18,
@@ -178,7 +202,7 @@ function conky_draw_text()
         {
                    text=conky_parse('${fs_used /} / ${fs_size /} (${fs_free /})'),
                    x=5,
-                   y=115,
+                   y=125,
                    v_align="t",
                    font_name="Nokia Pure",
                    font_size=16,
@@ -190,7 +214,7 @@ function conky_draw_text()
         {
                    text="/",
                    x=220,
-                   y=114,
+                   y=124,
                    v_align="t",
                    font_name="Nokia Pure",
                    font_size=18,
@@ -203,7 +227,7 @@ function conky_draw_text()
         {
                    text=conky_parse('${fs_used /home} / ${fs_size /home} (${fs_free /home})'),
                    x=5,
-                   y=135,
+                   y=145,
                    v_align="t",
                    font_name="Nokia Pure",
                    font_size=16,
@@ -215,7 +239,7 @@ function conky_draw_text()
         {
                    text="/home",
                    x=220,
-                   y=134,
+                   y=144,
                    v_align="t",
                    font_name="Nokia Pure",
                    font_size=18,
@@ -228,7 +252,7 @@ function conky_draw_text()
         {
                    text=conky_parse('${fs_used /home/user/MyDocs} / ${fs_size /home/user/MyDocs} (${fs_free /home/user/MyDocs})'),
                    x=5,
-                   y=155,
+                   y=165,
                    v_align="t",
                    font_name="Nokia Pure",
                    font_size=16,
@@ -241,7 +265,7 @@ function conky_draw_text()
         {
                    text="MyDocs",
                    x=220,
-                   y=154,
+                   y=164,
                    v_align="t",
                    font_name="Nokia Pure",
                    font_size=18,
@@ -251,8 +275,35 @@ function conky_draw_text()
                                reflection_alpha=0,
                                reflection_length=0,
                                DrawMe=conky_parse("${if_mounted /home/user/MyDocs}1$endif")
+        },        
+        {
+                   text="DiskIO",
+                   x=520,
+                   y=101,
+                   v_align="t",
+                   font_name="Nokia Pure",
+                   font_size=18,
+                       colour={{0,0xcc6600,1},{1,col0,1}},
+                       bold=true,
+                               orientation="ww",
+                               reflection_alpha=0,
+                               reflection_length=0,
+        },
+        {
+                   text="Charge Rate",
+                   x=720,
+                   y=101,
+                   v_align="t",
+                   font_name="Nokia Pure",
+                   font_size=18,
+                       colour={{0,0xFF0000,1},{1,col0,1}},
+                       bold=true,
+                               orientation="ww",
+                               reflection_alpha=0,
+                               reflection_length=0,
         },
- --[[       {
+        
+ --[[   {
                    text=conky_parse('${fs_used /media/mmc1} / ${fs_size /media/mmc1} (${fs_free /media/mmc1})'),
                    x=5,
                    y=175,
@@ -282,8 +333,8 @@ function conky_draw_text()
                ]]
         {
                    text=conky_parse('${wireless_essid wlan0}'),
-                       x=375,
-                   y=201,
+                       x=427,
+                   y=202,
                    h_align="c",
                    v_align="m",
                    font_name="Nokia Pure",
@@ -296,9 +347,9 @@ function conky_draw_text()
         },
         {
                    text="GPRS",
-                       x=430,
+                       x=427,
                    y=201,
-                   h_align="l",
+                   h_align="c",
                    v_align="m",
                    font_name="Nokia Pure",
                    font_size=18,
@@ -310,9 +361,9 @@ function conky_draw_text()
         },
         {
                    text=conky_parse('${wireless_link_qual_perc wlan0}')..'%',
-                       x=400,
-                   y=228,
-                   h_align="l",
+                       x=427,
+                   y=226,
+                   h_align="c",
                    v_align="m",
                    font_name="Nokia Pure",
                    font_size=14,