diff --git a/images/weather/am_pcloudy.png b/images/weather/am_pcloudy.png deleted file mode 100644 index 096fb6b..0000000 Binary files a/images/weather/am_pcloudy.png and /dev/null differ diff --git a/images/weather/am_pcloudyr.png b/images/weather/am_pcloudyr.png deleted file mode 100644 index ac8698d..0000000 Binary files a/images/weather/am_pcloudyr.png and /dev/null differ diff --git a/images/weather/am_showers.png b/images/weather/am_showers.png deleted file mode 100644 index 8e34692..0000000 Binary files a/images/weather/am_showers.png and /dev/null differ diff --git a/images/weather/am_snowshowers.png b/images/weather/am_snowshowers.png deleted file mode 100644 index 85efb4f..0000000 Binary files a/images/weather/am_snowshowers.png and /dev/null differ diff --git a/images/weather/am_tstorm.png b/images/weather/am_tstorm.png deleted file mode 100644 index d64955f..0000000 Binary files a/images/weather/am_tstorm.png and /dev/null differ diff --git a/images/weather/blizzard.png b/images/weather/blizzard.png deleted file mode 100644 index 18fa272..0000000 Binary files a/images/weather/blizzard.png and /dev/null differ diff --git a/images/weather/blizzardn.png b/images/weather/blizzardn.png deleted file mode 100644 index 18fa272..0000000 Binary files a/images/weather/blizzardn.png and /dev/null differ diff --git a/images/weather/blowingsnow.png b/images/weather/blowingsnow.png deleted file mode 100644 index 1ccf831..0000000 Binary files a/images/weather/blowingsnow.png and /dev/null differ diff --git a/images/weather/blowingsnown.png b/images/weather/blowingsnown.png deleted file mode 100644 index 1ccf831..0000000 Binary files a/images/weather/blowingsnown.png and /dev/null differ diff --git a/images/weather/chancetstorm.png b/images/weather/chancetstorm.png deleted file mode 100644 index dcaf5cc..0000000 Binary files a/images/weather/chancetstorm.png and /dev/null differ diff --git a/images/weather/chancetstormn.png b/images/weather/chancetstormn.png deleted file mode 100644 index 277854d..0000000 Binary files a/images/weather/chancetstormn.png and /dev/null differ diff --git a/images/weather/clear.png b/images/weather/clear.png deleted file mode 100644 index d8bba6e..0000000 Binary files a/images/weather/clear.png and /dev/null differ diff --git a/images/weather/clearn.png b/images/weather/clearn.png deleted file mode 100644 index c696931..0000000 Binary files a/images/weather/clearn.png and /dev/null differ diff --git a/images/weather/clearw.png b/images/weather/clearw.png deleted file mode 100644 index dce65f7..0000000 Binary files a/images/weather/clearw.png and /dev/null differ diff --git a/images/weather/clearwn.png b/images/weather/clearwn.png deleted file mode 100644 index c696931..0000000 Binary files a/images/weather/clearwn.png and /dev/null differ diff --git a/images/weather/cloudy.png b/images/weather/cloudy.png deleted file mode 100644 index 22c555c..0000000 Binary files a/images/weather/cloudy.png and /dev/null differ diff --git a/images/weather/cloudyn.png b/images/weather/cloudyn.png deleted file mode 100644 index 22c555c..0000000 Binary files a/images/weather/cloudyn.png and /dev/null differ diff --git a/images/weather/cloudyw.png b/images/weather/cloudyw.png deleted file mode 100644 index 7d22704..0000000 Binary files a/images/weather/cloudyw.png and /dev/null differ diff --git a/images/weather/cloudywn.png b/images/weather/cloudywn.png deleted file mode 100644 index 7d22704..0000000 Binary files a/images/weather/cloudywn.png and /dev/null differ diff --git a/images/weather/drizzle.png b/images/weather/drizzle.png deleted file mode 100644 index 389c76a..0000000 Binary files a/images/weather/drizzle.png and /dev/null differ diff --git a/images/weather/drizzlef.png b/images/weather/drizzlef.png deleted file mode 100644 index b995522..0000000 Binary files a/images/weather/drizzlef.png and /dev/null differ diff --git a/images/weather/drizzlen.png b/images/weather/drizzlen.png deleted file mode 100644 index 389c76a..0000000 Binary files a/images/weather/drizzlen.png and /dev/null differ diff --git a/images/weather/dust.png b/images/weather/dust.png deleted file mode 100644 index 52581d2..0000000 Binary files a/images/weather/dust.png and /dev/null differ diff --git a/images/weather/fair.png b/images/weather/fair.png deleted file mode 100644 index cb44dc6..0000000 Binary files a/images/weather/fair.png and /dev/null differ diff --git a/images/weather/fairn.png b/images/weather/fairn.png deleted file mode 100644 index 5c576bb..0000000 Binary files a/images/weather/fairn.png and /dev/null differ diff --git a/images/weather/fairw.png b/images/weather/fairw.png deleted file mode 100644 index 92979ff..0000000 Binary files a/images/weather/fairw.png and /dev/null differ diff --git a/images/weather/fairwn.png b/images/weather/fairwn.png deleted file mode 100644 index c5e632d..0000000 Binary files a/images/weather/fairwn.png and /dev/null differ diff --git a/images/weather/fdrizzle.png b/images/weather/fdrizzle.png deleted file mode 100644 index 66b2bc6..0000000 Binary files a/images/weather/fdrizzle.png and /dev/null differ diff --git a/images/weather/fdrizzlen.png b/images/weather/fdrizzlen.png deleted file mode 100644 index 66b2bc6..0000000 Binary files a/images/weather/fdrizzlen.png and /dev/null differ diff --git a/images/weather/flurries.png b/images/weather/flurries.png deleted file mode 100644 index 722d509..0000000 Binary files a/images/weather/flurries.png and /dev/null differ diff --git a/images/weather/flurriesn.png b/images/weather/flurriesn.png deleted file mode 100644 index 722d509..0000000 Binary files a/images/weather/flurriesn.png and /dev/null differ diff --git a/images/weather/flurriesw.png b/images/weather/flurriesw.png deleted file mode 100644 index 4579f8a..0000000 Binary files a/images/weather/flurriesw.png and /dev/null differ diff --git a/images/weather/flurrieswn.png b/images/weather/flurrieswn.png deleted file mode 100644 index 4579f8a..0000000 Binary files a/images/weather/flurrieswn.png and /dev/null differ diff --git a/images/weather/fog.png b/images/weather/fog.png deleted file mode 100644 index e08acad..0000000 Binary files a/images/weather/fog.png and /dev/null differ diff --git a/images/weather/fogn.png b/images/weather/fogn.png deleted file mode 100644 index e08acad..0000000 Binary files a/images/weather/fogn.png and /dev/null differ diff --git a/images/weather/freezingrain.png b/images/weather/freezingrain.png deleted file mode 100644 index 6cabd85..0000000 Binary files a/images/weather/freezingrain.png and /dev/null differ diff --git a/images/weather/freezingrainn.png b/images/weather/freezingrainn.png deleted file mode 100644 index 6cabd85..0000000 Binary files a/images/weather/freezingrainn.png and /dev/null differ diff --git a/images/weather/hazy.png b/images/weather/hazy.png deleted file mode 100644 index af54b9a..0000000 Binary files a/images/weather/hazy.png and /dev/null differ diff --git a/images/weather/hazyn.png b/images/weather/hazyn.png deleted file mode 100644 index e65e3c9..0000000 Binary files a/images/weather/hazyn.png and /dev/null differ diff --git a/images/weather/mcloudy.png b/images/weather/mcloudy.png deleted file mode 100644 index 7e379bb..0000000 Binary files a/images/weather/mcloudy.png and /dev/null differ diff --git a/images/weather/mcloudyn.png b/images/weather/mcloudyn.png deleted file mode 100644 index 03c4004..0000000 Binary files a/images/weather/mcloudyn.png and /dev/null differ diff --git a/images/weather/mcloudyr.png b/images/weather/mcloudyr.png deleted file mode 100644 index b3ce77c..0000000 Binary files a/images/weather/mcloudyr.png and /dev/null differ diff --git a/images/weather/mcloudyrn.png b/images/weather/mcloudyrn.png deleted file mode 100644 index 920d14c..0000000 Binary files a/images/weather/mcloudyrn.png and /dev/null differ diff --git a/images/weather/mcloudyrw.png b/images/weather/mcloudyrw.png deleted file mode 100644 index e07695b..0000000 Binary files a/images/weather/mcloudyrw.png and /dev/null differ diff --git a/images/weather/mcloudyrwn.png b/images/weather/mcloudyrwn.png deleted file mode 100644 index 5353e37..0000000 Binary files a/images/weather/mcloudyrwn.png and /dev/null differ diff --git a/images/weather/mcloudys.png b/images/weather/mcloudys.png deleted file mode 100644 index e21149b..0000000 Binary files a/images/weather/mcloudys.png and /dev/null differ diff --git a/images/weather/mcloudysfn.png b/images/weather/mcloudysfn.png deleted file mode 100644 index 9e241dd..0000000 Binary files a/images/weather/mcloudysfn.png and /dev/null differ diff --git a/images/weather/mcloudysfw.png b/images/weather/mcloudysfw.png deleted file mode 100644 index de588d0..0000000 Binary files a/images/weather/mcloudysfw.png and /dev/null differ diff --git a/images/weather/mcloudysfwn.png b/images/weather/mcloudysfwn.png deleted file mode 100644 index 338ebe8..0000000 Binary files a/images/weather/mcloudysfwn.png and /dev/null differ diff --git a/images/weather/mcloudysn.png b/images/weather/mcloudysn.png deleted file mode 100644 index 6124f24..0000000 Binary files a/images/weather/mcloudysn.png and /dev/null differ diff --git a/images/weather/mcloudysw.png b/images/weather/mcloudysw.png deleted file mode 100644 index b6060f2..0000000 Binary files a/images/weather/mcloudysw.png and /dev/null differ diff --git a/images/weather/mcloudyswn.png b/images/weather/mcloudyswn.png deleted file mode 100644 index f59849d..0000000 Binary files a/images/weather/mcloudyswn.png and /dev/null differ diff --git a/images/weather/mcloudyt.png b/images/weather/mcloudyt.png deleted file mode 100644 index 3d4eeb4..0000000 Binary files a/images/weather/mcloudyt.png and /dev/null differ diff --git a/images/weather/mcloudytn.png b/images/weather/mcloudytn.png deleted file mode 100644 index 045fc7b..0000000 Binary files a/images/weather/mcloudytn.png and /dev/null differ diff --git a/images/weather/mcloudytw.png b/images/weather/mcloudytw.png deleted file mode 100644 index d79707c..0000000 Binary files a/images/weather/mcloudytw.png and /dev/null differ diff --git a/images/weather/mcloudytwn.png b/images/weather/mcloudytwn.png deleted file mode 100644 index 5c46e7c..0000000 Binary files a/images/weather/mcloudytwn.png and /dev/null differ diff --git a/images/weather/mcloudyw.png b/images/weather/mcloudyw.png deleted file mode 100644 index 12efca7..0000000 Binary files a/images/weather/mcloudyw.png and /dev/null differ diff --git a/images/weather/mcloudywn.png b/images/weather/mcloudywn.png deleted file mode 100644 index 4667249..0000000 Binary files a/images/weather/mcloudywn.png and /dev/null differ diff --git a/images/weather/na.png b/images/weather/na.png deleted file mode 100644 index 172739d..0000000 Binary files a/images/weather/na.png and /dev/null differ diff --git a/images/weather/pcloudy.png b/images/weather/pcloudy.png deleted file mode 100644 index a56717b..0000000 Binary files a/images/weather/pcloudy.png and /dev/null differ diff --git a/images/weather/pcloudyn.png b/images/weather/pcloudyn.png deleted file mode 100644 index 4c1c357..0000000 Binary files a/images/weather/pcloudyn.png and /dev/null differ diff --git a/images/weather/pcloudyr.png b/images/weather/pcloudyr.png deleted file mode 100644 index 0b5434b..0000000 Binary files a/images/weather/pcloudyr.png and /dev/null differ diff --git a/images/weather/pcloudyrn.png b/images/weather/pcloudyrn.png deleted file mode 100644 index 1520782..0000000 Binary files a/images/weather/pcloudyrn.png and /dev/null differ diff --git a/images/weather/pcloudyrw.png b/images/weather/pcloudyrw.png deleted file mode 100644 index 890a821..0000000 Binary files a/images/weather/pcloudyrw.png and /dev/null differ diff --git a/images/weather/pcloudyrwn.png b/images/weather/pcloudyrwn.png deleted file mode 100644 index 1b6b189..0000000 Binary files a/images/weather/pcloudyrwn.png and /dev/null differ diff --git a/images/weather/pcloudys.png b/images/weather/pcloudys.png deleted file mode 100644 index a41145d..0000000 Binary files a/images/weather/pcloudys.png and /dev/null differ diff --git a/images/weather/pcloudysf.png b/images/weather/pcloudysf.png deleted file mode 100644 index a41145d..0000000 Binary files a/images/weather/pcloudysf.png and /dev/null differ diff --git a/images/weather/pcloudysfn.png b/images/weather/pcloudysfn.png deleted file mode 100644 index 4bba412..0000000 Binary files a/images/weather/pcloudysfn.png and /dev/null differ diff --git a/images/weather/pcloudysfw.png b/images/weather/pcloudysfw.png deleted file mode 100644 index d74b698..0000000 Binary files a/images/weather/pcloudysfw.png and /dev/null differ diff --git a/images/weather/pcloudysfwn.png b/images/weather/pcloudysfwn.png deleted file mode 100644 index 308490b..0000000 Binary files a/images/weather/pcloudysfwn.png and /dev/null differ diff --git a/images/weather/pcloudysn.png b/images/weather/pcloudysn.png deleted file mode 100644 index ba5403a..0000000 Binary files a/images/weather/pcloudysn.png and /dev/null differ diff --git a/images/weather/pcloudysw.png b/images/weather/pcloudysw.png deleted file mode 100644 index 8d3d37a..0000000 Binary files a/images/weather/pcloudysw.png and /dev/null differ diff --git a/images/weather/pcloudyswn.png b/images/weather/pcloudyswn.png deleted file mode 100644 index 9c4ae84..0000000 Binary files a/images/weather/pcloudyswn.png and /dev/null differ diff --git a/images/weather/pcloudyt.png b/images/weather/pcloudyt.png deleted file mode 100644 index dcaf5cc..0000000 Binary files a/images/weather/pcloudyt.png and /dev/null differ diff --git a/images/weather/pcloudytn.png b/images/weather/pcloudytn.png deleted file mode 100644 index 277854d..0000000 Binary files a/images/weather/pcloudytn.png and /dev/null differ diff --git a/images/weather/pcloudytw.png b/images/weather/pcloudytw.png deleted file mode 100644 index d1d35f8..0000000 Binary files a/images/weather/pcloudytw.png and /dev/null differ diff --git a/images/weather/pcloudytwn.png b/images/weather/pcloudytwn.png deleted file mode 100644 index 1688492..0000000 Binary files a/images/weather/pcloudytwn.png and /dev/null differ diff --git a/images/weather/pcloudyw.png b/images/weather/pcloudyw.png deleted file mode 100644 index 44e83bc..0000000 Binary files a/images/weather/pcloudyw.png and /dev/null differ diff --git a/images/weather/pcloudywn.png b/images/weather/pcloudywn.png deleted file mode 100644 index 4e109e7..0000000 Binary files a/images/weather/pcloudywn.png and /dev/null differ diff --git a/images/weather/pm_pcloudy.png b/images/weather/pm_pcloudy.png deleted file mode 100644 index c7435d3..0000000 Binary files a/images/weather/pm_pcloudy.png and /dev/null differ diff --git a/images/weather/pm_pcloudyr.png b/images/weather/pm_pcloudyr.png deleted file mode 100644 index 6c52612..0000000 Binary files a/images/weather/pm_pcloudyr.png and /dev/null differ diff --git a/images/weather/pm_showers.png b/images/weather/pm_showers.png deleted file mode 100644 index c8e25fe..0000000 Binary files a/images/weather/pm_showers.png and /dev/null differ diff --git a/images/weather/pm_snowshowers.png b/images/weather/pm_snowshowers.png deleted file mode 100644 index 39599fe..0000000 Binary files a/images/weather/pm_snowshowers.png and /dev/null differ diff --git a/images/weather/pm_tstorm.png b/images/weather/pm_tstorm.png deleted file mode 100644 index be1d833..0000000 Binary files a/images/weather/pm_tstorm.png and /dev/null differ diff --git a/images/weather/rain.png b/images/weather/rain.png deleted file mode 100644 index 53d8d52..0000000 Binary files a/images/weather/rain.png and /dev/null differ diff --git a/images/weather/rainandsnow.png b/images/weather/rainandsnow.png deleted file mode 100644 index 23dd0b8..0000000 Binary files a/images/weather/rainandsnow.png and /dev/null differ diff --git a/images/weather/rainandsnown.png b/images/weather/rainandsnown.png deleted file mode 100644 index 23dd0b8..0000000 Binary files a/images/weather/rainandsnown.png and /dev/null differ diff --git a/images/weather/rainn.png b/images/weather/rainn.png deleted file mode 100644 index 53d8d52..0000000 Binary files a/images/weather/rainn.png and /dev/null differ diff --git a/images/weather/raintosnow.png b/images/weather/raintosnow.png deleted file mode 100644 index 6f56150..0000000 Binary files a/images/weather/raintosnow.png and /dev/null differ diff --git a/images/weather/raintosnown.png b/images/weather/raintosnown.png deleted file mode 100644 index 6f56150..0000000 Binary files a/images/weather/raintosnown.png and /dev/null differ diff --git a/images/weather/rainw.png b/images/weather/rainw.png deleted file mode 100644 index baa5c2e..0000000 Binary files a/images/weather/rainw.png and /dev/null differ diff --git a/images/weather/showers.png b/images/weather/showers.png deleted file mode 100644 index de4eab2..0000000 Binary files a/images/weather/showers.png and /dev/null differ diff --git a/images/weather/showersn.png b/images/weather/showersn.png deleted file mode 100644 index de4eab2..0000000 Binary files a/images/weather/showersn.png and /dev/null differ diff --git a/images/weather/showersw.png b/images/weather/showersw.png deleted file mode 100644 index 60bf9da..0000000 Binary files a/images/weather/showersw.png and /dev/null differ diff --git a/images/weather/showerswn.png b/images/weather/showerswn.png deleted file mode 100644 index 60bf9da..0000000 Binary files a/images/weather/showerswn.png and /dev/null differ diff --git a/images/weather/sleet.png b/images/weather/sleet.png deleted file mode 100644 index bb70907..0000000 Binary files a/images/weather/sleet.png and /dev/null differ diff --git a/images/weather/sleetn.png b/images/weather/sleetn.png deleted file mode 100644 index bb70907..0000000 Binary files a/images/weather/sleetn.png and /dev/null differ diff --git a/images/weather/sleetsnow.png b/images/weather/sleetsnow.png deleted file mode 100644 index 40732fd..0000000 Binary files a/images/weather/sleetsnow.png and /dev/null differ diff --git a/images/weather/smoke.png b/images/weather/smoke.png deleted file mode 100644 index 1fe4301..0000000 Binary files a/images/weather/smoke.png and /dev/null differ diff --git a/images/weather/snow.png b/images/weather/snow.png deleted file mode 100644 index fd3bd95..0000000 Binary files a/images/weather/snow.png and /dev/null differ diff --git a/images/weather/snown.png b/images/weather/snown.png deleted file mode 100644 index fd3bd95..0000000 Binary files a/images/weather/snown.png and /dev/null differ diff --git a/images/weather/snowshowers.png b/images/weather/snowshowers.png deleted file mode 100644 index cb9d614..0000000 Binary files a/images/weather/snowshowers.png and /dev/null differ diff --git a/images/weather/snowshowersn.png b/images/weather/snowshowersn.png deleted file mode 100644 index cb9d614..0000000 Binary files a/images/weather/snowshowersn.png and /dev/null differ diff --git a/images/weather/snowshowersw.png b/images/weather/snowshowersw.png deleted file mode 100644 index 81c991c..0000000 Binary files a/images/weather/snowshowersw.png and /dev/null differ diff --git a/images/weather/snowshowerswn.png b/images/weather/snowshowerswn.png deleted file mode 100644 index 81c991c..0000000 Binary files a/images/weather/snowshowerswn.png and /dev/null differ diff --git a/images/weather/snowtorain.png b/images/weather/snowtorain.png deleted file mode 100644 index 835c3f7..0000000 Binary files a/images/weather/snowtorain.png and /dev/null differ diff --git a/images/weather/snowtorainn.png b/images/weather/snowtorainn.png deleted file mode 100644 index 835c3f7..0000000 Binary files a/images/weather/snowtorainn.png and /dev/null differ diff --git a/images/weather/snoww.png b/images/weather/snoww.png deleted file mode 100644 index 6cd264e..0000000 Binary files a/images/weather/snoww.png and /dev/null differ diff --git a/images/weather/snowwn.png b/images/weather/snowwn.png deleted file mode 100644 index 6cd264e..0000000 Binary files a/images/weather/snowwn.png and /dev/null differ diff --git a/images/weather/sunny.png b/images/weather/sunny.png deleted file mode 100644 index d8bba6e..0000000 Binary files a/images/weather/sunny.png and /dev/null differ diff --git a/images/weather/sunnyn.png b/images/weather/sunnyn.png deleted file mode 100644 index c696931..0000000 Binary files a/images/weather/sunnyn.png and /dev/null differ diff --git a/images/weather/sunnyw.png b/images/weather/sunnyw.png deleted file mode 100644 index dce65f7..0000000 Binary files a/images/weather/sunnyw.png and /dev/null differ diff --git a/images/weather/sunnywn.png b/images/weather/sunnywn.png deleted file mode 100644 index c696931..0000000 Binary files a/images/weather/sunnywn.png and /dev/null differ diff --git a/images/weather/tstorm.png b/images/weather/tstorm.png deleted file mode 100644 index c316829..0000000 Binary files a/images/weather/tstorm.png and /dev/null differ diff --git a/images/weather/tstormn.png b/images/weather/tstormn.png deleted file mode 100644 index c316829..0000000 Binary files a/images/weather/tstormn.png and /dev/null differ diff --git a/images/weather/tstormsw.png b/images/weather/tstormsw.png deleted file mode 100644 index 5f08bc8..0000000 Binary files a/images/weather/tstormsw.png and /dev/null differ diff --git a/images/weather/tstormswn.png b/images/weather/tstormswn.png deleted file mode 100644 index 5f08bc8..0000000 Binary files a/images/weather/tstormswn.png and /dev/null differ diff --git a/images/weather/tstormw.png b/images/weather/tstormw.png deleted file mode 100644 index 5f08bc8..0000000 Binary files a/images/weather/tstormw.png and /dev/null differ diff --git a/images/weather/tstormwn.png b/images/weather/tstormwn.png deleted file mode 100644 index 5f08bc8..0000000 Binary files a/images/weather/tstormwn.png and /dev/null differ diff --git a/images/weather/wind.png b/images/weather/wind.png deleted file mode 100644 index f4b9ba2..0000000 Binary files a/images/weather/wind.png and /dev/null differ diff --git a/images/weather/wintrymix.png b/images/weather/wintrymix.png deleted file mode 100644 index 0fe36e6..0000000 Binary files a/images/weather/wintrymix.png and /dev/null differ diff --git a/images/weather/wintrymixn.png b/images/weather/wintrymixn.png deleted file mode 100644 index 0fe36e6..0000000 Binary files a/images/weather/wintrymixn.png and /dev/null differ diff --git a/main.lua b/main.lua index 9b02c6c..0f66cd5 100644 --- a/main.lua +++ b/main.lua @@ -97,7 +97,6 @@ package.path = _G_INIT_DATA_.ABS_PATH..'/?.lua;'.. conky_set_update_interval(_G_INIT_DATA_.UPDATE_INTERVAL) -require 'imlib2' require 'cairo' _G_Widget_ = require 'Widget' @@ -114,7 +113,6 @@ local Power = require 'Power' local ReadWrite = require 'ReadWrite' local Graphics = require 'Graphics' local Memory = require 'Memory' -local Weather = require 'Weather' local _unrequire = function(m) package.loaded[m] = nil end @@ -138,7 +136,6 @@ local __cairo_create = cairo_create local __cairo_surface_destroy = cairo_surface_destroy local __cairo_destroy = cairo_destroy local __collectgarbage = collectgarbage -local __os_execute = os.execute local using_ac = function() return Util.conky('${acpiacadapter AC}') == 'on-line' @@ -153,7 +150,8 @@ local check_if_log_changed = function() return 0 end -__os_execute('set_conky_interface.sh 0') +-- kept for historic reasons, if we choose to make another panel then this +-- will be useful local current_interface = 0 function conky_main() @@ -177,22 +175,8 @@ function conky_main() local log_is_changed = false if t2 == 0 then log_is_changed = check_if_log_changed() end - local interface_is_changed = false - - local next_interface = Util.read_file('/tmp/conky_interface', nil, '*n') - - if next_interface == '' then - __os_execute('set_conky_interface.sh 0') - current_interface = 0 - interface_is_changed = true - elseif next_interface ~= current_interface then - current_interface = next_interface - interface_is_changed = true - end - Panel(cr) - --interface 0 System(cr, current_interface, log_is_changed) Graphics(cr, current_interface) Processor(cr, current_interface) @@ -205,9 +189,6 @@ function conky_main() Power(cr, current_interface, UPDATE_FREQUENCY, is_using_ac) Memory(cr, current_interface) - --interface 1 - Weather(cr, current_interface, interface_is_changed) - __cairo_surface_destroy(cs) __cairo_destroy(cr) __collectgarbage() diff --git a/scripts/get_weather.sh b/scripts/get_weather.sh deleted file mode 100755 index 04162ab..0000000 --- a/scripts/get_weather.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -#read location -location_string=$(cat $CONKY_LUA_HOME/scripts/location) - -#get weather -weather_url="http://api.aerisapi.com/batch/" - -o_fields="fields=\ -place.name,\ -place.state,\ -place.country,\ -ob.timestamp,\ -ob.tempF,\ -ob.dewpointF,\ -ob.sky,\ -ob.visibilityMI,\ -ob.ceilingFT,\ -ob.humidity,\ -ob.pressureMB,\ -ob.windSpeedMPH,\ -ob.windGustMPH,\ -ob.windDirDEG,\ -ob.weather,\ -ob.feelslikeF,\ -ob.icon,\ -ob.sunrise,\ -ob.sunset,\ -ob.light,\ -ob.precipIN" - -observations="/observations%3F$o_fields" - -h_fields="fields=\ -periods.timestamp,\ -periods.avgTempF,\ -periods.feelslikeF,\ -periods.pop,\ -periods.humidity,\ -periods.windSpeedMPH,\ -periods.icon,\ -periods.weatherPrimary" - -hourly="/forecasts%3Ffilter=4hr%26limit=8%26$h_fields" - -d_fields="fields=\ -periods.timestamp,\ -periods.minTempF,\ -periods.maxTempF,\ -periods.pop,\ -periods.humidity,\ -periods.windDir,\ -periods.icon,\ -periods.windSpeedMPH,\ -periods.weatherPrimary" - -daily="/forecasts%3Ffrom=tomorrow%26limit=8%26$d_fields" - -alerts="/alerts" - -id="client_id=TdJ5M1pUXWUUebhfRKSs2" -secret="client_secret=DmI2NHCO6BQ5hSH4yAECVJlgA8gYZ1C4BvNaGEuM" - -curl -s "$weather_url$location_string?requests=$observations,$hourly,$daily&$id&$secret" > /tmp/weather.json && \ -echo true > /tmp/weather_recently_updated & diff --git a/scripts/location b/scripts/location deleted file mode 100644 index bd8ea97..0000000 --- a/scripts/location +++ /dev/null @@ -1 +0,0 @@ -30308 diff --git a/scripts/set_conky_interface.sh b/scripts/set_conky_interface.sh deleted file mode 100755 index 8f7ddf4..0000000 --- a/scripts/set_conky_interface.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "$1" > /tmp/conky_interface diff --git a/scripts/update_location.sh b/scripts/update_location.sh deleted file mode 100755 index e8f513d..0000000 --- a/scripts/update_location.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -location=$(zenity --text "Enter current location in one of the following formats - -lat,lon -city,state,[country] -city,country -zip -airport" --entry) - -location=${location//" "/"+"} -retval=$? -case $retval in - 0) - echo "$location" > $CONKY_LUA_HOME/scripts/location - get_weather.sh;; - 1) - echo "Cancel pressed.";; -esac