diff --git a/src/gui/lua/Makefile.am b/src/gui/lua/Makefile.am
index 2e8165ce1..e28802597 100644
--- a/src/gui/lua/Makefile.am
+++ b/src/gui/lua/Makefile.am
@@ -34,6 +34,7 @@ libneutrino_gui_lua_a_SOURCES = \
lua_curl.cpp \
lua_filehelpers.cpp \
lua_hintbox.cpp \
+ lua_hourglass.cpp \
lua_menue.cpp \
lua_messagebox.cpp \
lua_misc.cpp \
diff --git a/src/gui/lua/lua_hourglass.cpp b/src/gui/lua/lua_hourglass.cpp
new file mode 100644
index 000000000..3c87ba709
--- /dev/null
+++ b/src/gui/lua/lua_hourglass.cpp
@@ -0,0 +1,144 @@
+/*
+ * lua hourglass/loader
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+
+#include "luainstance.h"
+#include "lua_hourglass.h"
+#include "lua_cc_window.h"
+
+CLuaInstHourGlass* CLuaInstHourGlass::getInstance()
+{
+ static CLuaInstHourGlass* LuaInstHourGlass = NULL;
+
+ if(!LuaInstHourGlass)
+ LuaInstHourGlass = new CLuaInstHourGlass();
+ return LuaInstHourGlass;
+}
+
+void CLuaInstHourGlass::HourGlassRegister(lua_State *L)
+{
+ luaL_Reg meth[] = {
+ { "new", CLuaInstHourGlass::HourGlassNew },
+ { "paint", CLuaInstHourGlass::HourGlassPaint },
+ { "hide", CLuaInstHourGlass::HourGlassHide },
+ { "__gc", CLuaInstHourGlass::HourGlassDelete },
+ { NULL, NULL }
+ };
+
+ luaL_newmetatable(L, "hourglass");
+ luaL_setfuncs(L, meth, 0);
+ lua_pushvalue(L, -1);
+ lua_setfield(L, -1, "__index");
+ lua_setglobal(L, "hourglass");
+}
+
+int CLuaInstHourGlass::HourGlassNew(lua_State *L)
+{
+ lua_assert(lua_istable(L,1));
+
+ lua_Integer x = 20, y = 20, dx = 48, dy = 48;
+ tableLookup(L, "x", x);
+ tableLookup(L, "y", y);
+ tableLookup(L, "dx", dx);
+ tableLookup(L, "dy", dy);
+
+ std::string image_basename = "hourglass";
+ tableLookup(L, "image_basename", image_basename);
+
+ lua_Integer interval = HG_AUTO_PAINT_INTERVAL;
+ tableLookup(L, "interval", interval);
+
+ CLuaCCWindow* parent = NULL;
+ tableLookup(L, "parent", (void**)&parent);
+
+ lua_Integer shadow_mode = CC_SHADOW_OFF;
+ tableLookup(L, "shadow_mode", shadow_mode);
+
+ lua_Unsigned color_frame = (lua_Unsigned)COL_FRAME_PLUS_0;
+ lua_Unsigned color_background = (lua_Unsigned)COL_MENUCONTENT_PLUS_0;
+ lua_Unsigned color_shadow = (lua_Unsigned)COL_SHADOW_PLUS_0;
+ tableLookup(L, "color_frame", color_frame);
+ tableLookup(L, "color_background", color_background);
+ tableLookup(L, "color_shadow", color_shadow);
+
+ CComponentsForm* parent_container = (parent && parent->w) ? parent->w->getBodyObject() : NULL;
+
+ CLuaHourGlass **udata = (CLuaHourGlass **) lua_newuserdata(L, sizeof(CLuaHourGlass *));
+ *udata = new CLuaHourGlass();
+
+ (*udata)->h = new CHourGlass(x, y, dx, dy, image_basename, (int64_t)interval, parent_container, shadow_mode, (fb_pixel_t)color_frame, (fb_pixel_t)color_background, (fb_pixel_t)color_shadow);
+
+ luaL_getmetatable(L, "hourglass");
+ lua_setmetatable(L, -2);
+ return 1;
+}
+
+CLuaHourGlass *CLuaInstHourGlass::HourGlassCheck(lua_State *L, int n)
+{
+ return *(CLuaHourGlass **) luaL_checkudata(L, n, "hourglass");
+}
+
+int CLuaInstHourGlass::HourGlassPaint(lua_State *L)
+{
+ lua_assert(lua_istable(L,1));
+ CLuaHourGlass *D = HourGlassCheck(L, 1);
+ if (!D) return 0;
+
+ bool do_save_bg = true;
+ if (!tableLookup(L, "do_save_bg", do_save_bg)) {
+ std::string tmp = "true";
+ if (tableLookup(L, "do_save_bg", tmp))
+ paramBoolDeprecated(L, tmp.c_str());
+ do_save_bg = (tmp == "true" || tmp == "1" || tmp == "yes");
+ }
+ D->h->paint(do_save_bg);
+ return 0;
+}
+
+int CLuaInstHourGlass::HourGlassHide(lua_State *L)
+{
+ lua_assert(lua_istable(L,1));
+ CLuaHourGlass *D = HourGlassCheck(L, 1);
+ if (!D) return 0;
+
+ bool tmp1 = false;
+ std::string tmp2 = "false";
+ if ((tableLookup(L, "no_restore", tmp1)) || (tableLookup(L, "no_restore", tmp2)))
+ obsoleteHideParameter(L);
+
+ D->h->hide();
+ return 0;
+}
+
+int CLuaInstHourGlass::HourGlassDelete(lua_State *L)
+{
+ LUA_DEBUG("CLuaInstHourGlass::%s %d\n", __func__, lua_gettop(L));
+ CLuaHourGlass *D = HourGlassCheck(L, 1);
+ if (!D) return 0;
+ delete D;
+ return 0;
+}
diff --git a/src/gui/lua/lua_hourglass.h b/src/gui/lua/lua_hourglass.h
new file mode 100644
index 000000000..1669d0fe5
--- /dev/null
+++ b/src/gui/lua/lua_hourglass.h
@@ -0,0 +1,48 @@
+/*
+ * lua hourglass/loader
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#ifndef _LUAHOURGLASS_H_
+#define _LUAHOURGLASS_H_
+
+#include
+
+class CLuaHourGlass
+{
+ public:
+ CHourGlass *h;
+ CLuaHourGlass() { h = NULL; }
+ ~CLuaHourGlass() { delete h; }
+};
+
+class CLuaInstHourGlass
+{
+ public:
+ CLuaInstHourGlass() {};
+ ~CLuaInstHourGlass() {};
+ static CLuaInstHourGlass* getInstance();
+ static void HourGlassRegister(lua_State *L);
+
+ private:
+ static CLuaHourGlass *HourGlassCheck(lua_State *L, int n);
+
+ static int HourGlassNew(lua_State *L);
+ static int HourGlassPaint(lua_State *L);
+ static int HourGlassHide(lua_State *L);
+ static int HourGlassDelete(lua_State *L);
+};
+
+#endif //_LUAHOURGLASS_H_
diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp
index d4ee22481..f33d3042a 100644
--- a/src/gui/lua/luainstance.cpp
+++ b/src/gui/lua/luainstance.cpp
@@ -49,6 +49,7 @@
#include "lua_curl.h"
#include "lua_filehelpers.h"
#include "lua_hintbox.h"
+#include "lua_hourglass.h"
#include "lua_menue.h"
#include "lua_messagebox.h"
#include "lua_misc.h"
@@ -761,6 +762,7 @@ void LuaInstRegisterFunctions(lua_State *L, bool fromThreads/*=false*/)
CLuaInstCurl::getInstance()->LuaCurlRegister(L);
CLuaInstFileHelpers::getInstance()->LuaFileHelpersRegister(L);
CLuaInstHintbox::getInstance()->HintboxRegister(L);
+ CLuaInstHourGlass::getInstance()->HourGlassRegister(L);
CLuaInstMenu::getInstance()->MenuRegister(L);
CLuaInstMessagebox::getInstance()->MessageboxRegister(L);
CLuaInstStringInput::getInstance()->StringInputRegister(L);