harmattan version.

[monky] / lua_scripts / text.lua

diff --git a/lua_scripts/text.lua b/lua_scripts/text.lua
index 0f5fbfc..ad81b99 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,7 +90,7 @@ 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,
                                y=15,
@@ -101,7 +101,7 @@ function conky_draw_text()
                }, 
                {
                                text=conky_parse("$freq MHz"),
-                               font_name="Droid Sans Mono",
+                               font_name="Nokia Pure",
                                font_size=16,
                                h_align="l",
                                v_align="t",
@@ -119,7 +119,7 @@ function conky_draw_text()
                    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",
@@ -132,7 +132,7 @@ function conky_draw_text()
                    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 +143,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",
@@ -156,7 +156,7 @@ function conky_draw_text()
                    y=65,
                    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",
@@ -168,7 +168,7 @@ function conky_draw_text()
                    x=223,
                    y=91,
                    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",
@@ -180,7 +180,7 @@ function conky_draw_text()
                    x=5,
                    y=115,
                    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",
@@ -192,7 +192,7 @@ function conky_draw_text()
                    x=220,
                    y=114,
                    v_align="t",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,0x336633,1},{1,col0,1}},
                        bold=true,
@@ -205,7 +205,7 @@ function conky_draw_text()
                    x=5,
                    y=135,
                    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",
@@ -217,7 +217,7 @@ function conky_draw_text()
                    x=220,
                    y=134,
                    v_align="t",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,0x336633,1},{1,col0,1}},
                        bold=true,
@@ -230,7 +230,7 @@ function conky_draw_text()
                    x=5,
                    y=155,
                    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",
@@ -243,7 +243,7 @@ function conky_draw_text()
                    x=220,
                    y=154,
                    v_align="t",
-                   font_name="Droid Sans Mono",
+                   font_name="Nokia Pure",
                    font_size=18,
                        colour={{0,0x336633,1},{1,col0,1}},
                        bold=true,
@@ -252,12 +252,12 @@ function conky_draw_text()
                                reflection_length=0,
                                DrawMe=conky_parse("${if_mounted /home/user/MyDocs}1$endif")
         },
-        {
+ --[[       {
                    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 +270,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 +279,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,
+                       x=375,
                    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",
                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=430,
                    y=201,
-                   h_align="c",
+                   h_align="l",
                    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",
@@ -311,18 +312,18 @@ function conky_draw_text()
                    text=conky_parse('${wireless_link_qual_perc wlan0}')..'%',
                        x=400,
                    y=228,
-                   h_align="c",
-                   v_align="l",
-                   font_name="Droid Sans Mono",
+                   h_align="l",
+                   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 +335,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 +350,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 +381,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