changes related to temperature and layout

[monky] / lua_scripts / text.lua

diff --git a/lua_scripts/text.lua b/lua_scripts/text.lua
index 0f5fbfc..f8415b8 100644 (file)
--- a/lua_scripts/text.lua
+++ b/lua_scripts/text.lua
@@ -72,7 +72,7 @@ function conky_draw_text()
                                text=conky_parse("${time %I:%M%p %D}"),
                                font_size=24,
                                bold=true,
-                               font_name="Droid Sans Mono",
+                               font_name="Nokia Pure",
                                h_align="l",
                                v_align="t",
                                x=5,
@@ -90,18 +90,29 @@ function conky_draw_text()
                                text=conky_parse("$sysname $kernel on $machine - $uptime"),
                                font_size=16,
                                bold=true,
-                               font_name="Droid Sans Mono",
+                               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"),
-                               font_name="Droid Sans Mono",
+                               font_name="Nokia Pure",
                                font_size=16,
                                h_align="l",
                                v_align="t",
@@ -115,24 +126,37 @@ 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",
-                   font_name="Droid Sans Mono",
+                   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_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",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=14,
                        colour={{0,col0,1},{0.5,colbg,1}},
                                orientation="nn",
@@ -143,7 +167,7 @@ function conky_draw_text()
                    text=conky_parse("${cell_radio_dbm}".."dBm"),
                        x=510,
                    y=50,
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=14,
                        colour={{0,col0,1},{0.5,colbg,1}},
                                orientation="nn",
@@ -153,10 +177,10 @@ function conky_draw_text()
         {
                    text=conky_parse('${cpu}').."%",
                        x=223,
-                   y=65,
+                   y=67,
                    v_align="t",
                    h_align="l",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,col0,1},{0.5,colbg,1}},
                                orientation="ww",
@@ -164,11 +188,11 @@ 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="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,col0,1},{0.5,colbg,1}},
                                orientation="nn",
@@ -178,9 +202,9 @@ function conky_draw_text()
         {
                    text=conky_parse('${fs_used /} / ${fs_size /} (${fs_free /})'),
                    x=5,
-                   y=115,
+                   y=125,
                    v_align="t",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=16,
                        colour={{conky_parse('${fs_used_perc /}')/100,0x000000,1},{1,0xFFFFFF,1}},
                                orientation="ww",
@@ -190,9 +214,9 @@ function conky_draw_text()
         {
                    text="/",
                    x=220,
-                   y=114,
+                   y=124,
                    v_align="t",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,0x336633,1},{1,col0,1}},
                        bold=true,
@@ -203,9 +227,9 @@ 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="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=16,
                        colour={{conky_parse('${fs_used_perc /home}')/100,0x000000,1},{1,0xFFFFFF,1}},
                                orientation="ww",
@@ -215,9 +239,9 @@ function conky_draw_text()
         {
                    text="/home",
                    x=220,
-                   y=134,
+                   y=144,
                    v_align="t",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,0x336633,1},{1,col0,1}},
                        bold=true,
@@ -228,9 +252,9 @@ 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="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=16,
                        colour={{conky_parse('${fs_used_perc /home/user/MyDocs}')/100-.1,0x000000,1},{1,0xFFFFFF,1}},
                                orientation="ww",
@@ -241,9 +265,9 @@ function conky_draw_text()
         {
                    text="MyDocs",
                    x=220,
-                   y=154,
+                   y=164,
                    v_align="t",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,0x336633,1},{1,col0,1}},
                        bold=true,
@@ -251,13 +275,40 @@ 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,
                    v_align="t",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=16,
                        colour={{conky_parse('${fs_used_perc /media/mmc1}')/100-.1,0x000000,1},{1,0xFFFFFF,1}},
                                orientation="ww",
@@ -270,7 +321,7 @@ function conky_draw_text()
                    x=220,
                    y=174,
                    v_align="t",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,0x336633,1},{1,col0,1}},
                        bold=true,
@@ -279,27 +330,28 @@ function conky_draw_text()
                                reflection_length=0,
                                DrawMe=conky_parse("${if_mounted /media/mmc1}1$endif"),
         },
+               ]]
         {
                    text=conky_parse('${wireless_essid wlan0}'),
-                       x=400,
-                   y=201,
+                       x=427,
+                   y=202,
                    h_align="c",
                    v_align="m",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,col0,1},{0.5,colbg,1}},
                                orientation="nn",
                reflection_alpha=0,
                reflection_length=0,
-               DrawMe=conky_parse("${if_empty ${wireless_essid wlan0}}${else}1$endif"),
+               DrawMe=conky_parse("${if_up wlan0}1${else}0$endif"),
         },
         {
                    text="GPRS",
-                       x=400,
+                       x=427,
                    y=201,
                    h_align="c",
                    v_align="m",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,col0,1},{0.5,colbg,1}},
                                orientation="nn",
@@ -309,20 +361,20 @@ function conky_draw_text()
         },
         {
                    text=conky_parse('${wireless_link_qual_perc wlan0}')..'%',
-                       x=400,
-                   y=228,
+                       x=427,
+                   y=226,
                    h_align="c",
-                   v_align="l",
-                   font_name="Droid Sans Mono",
+                   v_align="m",
+                   font_name="Nokia Pure",
                    font_size=14,
                        colour={{0,col0,1},{0.5,colbg,1}},
                                orientation="nn",
                reflection_alpha=0,
                reflection_length=0,
-               DrawMe=conky_parse("${if_empty ${wireless_essid wlan0}}${else}1$endif"),
+               DrawMe=conky_parse("${if_up wlan0}1${else}0$endif"),
         },
         {
-                   text='Up '..conky_parse('${upspeed wlan0}'),
+                   text='Up '..conky_parse('${upspeedf wlan0}') + conky_parse('${upspeedf gprs0}'),
                        x=225,
                    y=223,
                    h_align="l",
@@ -334,10 +386,10 @@ function conky_draw_text()
                                orientation="ww",
                reflection_alpha=0,
                reflection_length=0,
-               DrawMe=conky_parse("${if_empty ${wireless_essid wlan0}}${else}1$endif"),
+               DrawMe=conky_parse("${if_up wlan0}1${else}0$endif"),
         },
         {
-                   text=conky_parse('${downspeed wlan0}')..' Down',
+                   text=conky_parse('${downspeedf wlan0}') + conky_parse('${downspeedf gprs0}')..' Down',
                        x=650,
                    y=223,
                    h_align="r",
@@ -349,9 +401,9 @@ function conky_draw_text()
                                orientation="ww",
                reflection_alpha=0,
                reflection_length=0,
-               DrawMe=conky_parse("${if_empty ${wireless_essid wlan0}}${else}1$endif"),
+               DrawMe=conky_parse("${if_up wlan0}1${else}0$endif"),
         },
-        {
+   --[[     {
                    text='Up '..conky_parse('${upspeed gprs0}'),
                        x=225,
                    y=223,
@@ -380,7 +432,7 @@ function conky_draw_text()
                reflection_alpha=0,
                reflection_length=0,
                DrawMe=conky_parse("${if_up gprs0}1${else}0$endif"),
-        },  
+        },]]  
     }
     if conky_window == nil then return end
     if tonumber(conky_parse("$updates"))<3 then return end