|
|
|
@ -12,43 +12,38 @@ |
|
|
|
#include <XojMsgBox.h> |
|
|
|
#include <XojMsgBox.h> |
|
|
|
#include <StringUtils.h> |
|
|
|
#include <StringUtils.h> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include <map> |
|
|
|
|
|
|
|
using std::map; |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Example: |
|
|
|
* Example: |
|
|
|
* app.msgbox("Test123", "yes,no") |
|
|
|
* app.msgbox("Test123", {[1] = "Yes", [2] = "No"}) |
|
|
|
|
|
|
|
* Return 1 for yes, 2 for no in this example |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
static int applib_msgbox(lua_State* L) |
|
|
|
static int applib_msgbox(lua_State* L) |
|
|
|
{ |
|
|
|
{ |
|
|
|
const char* msg = luaL_checkstring(L, 1); |
|
|
|
const char* msg = luaL_checkstring(L, 1); |
|
|
|
const char* flags = luaL_checkstring(L, 2); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int type = 0; |
|
|
|
// discard any extra arguments passed in
|
|
|
|
for (string element : StringUtils::split(flags, ',')) |
|
|
|
lua_settop(L, 2); |
|
|
|
|
|
|
|
luaL_checktype(L, 2, LUA_TTABLE); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
lua_pushnil(L); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
map<int, string> button; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while (lua_next(L, 2) != 0) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (element == "ok") |
|
|
|
int index = lua_tointeger(L, -2); |
|
|
|
{ |
|
|
|
const char* buttonText = luaL_checkstring(L, -1); |
|
|
|
type |= MSG_BT_OK; |
|
|
|
lua_pop(L, 1); |
|
|
|
} |
|
|
|
|
|
|
|
else if (element == "yes") |
|
|
|
button.insert(button.begin(), std::pair<int, string>(index, buttonText)); |
|
|
|
{ |
|
|
|
|
|
|
|
type |= MSG_BT_YES; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else if (element == "no") |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
type |= MSG_BT_NO; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else if (element == "cancel") |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
type |= MSG_BT_CANCEL; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
g_warning("Plugin: Unsupported button type for app.msgbox «%s»", element.c_str()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Plugin* plugin = Plugin::getPluginFromLua(L); |
|
|
|
Plugin* plugin = Plugin::getPluginFromLua(L); |
|
|
|
|
|
|
|
|
|
|
|
int result = XojMsgBox::showPluginMessage(plugin->getName(), msg, type); |
|
|
|
int result = XojMsgBox::showPluginMessage(plugin->getName(), msg, button); |
|
|
|
lua_pushinteger(L, result); |
|
|
|
lua_pushinteger(L, result); |
|
|
|
return 1; |
|
|
|
return 1; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -73,30 +68,41 @@ static int applib_registerUi(lua_State* L) |
|
|
|
// 'unpack' the table by putting the values onto
|
|
|
|
// 'unpack' the table by putting the values onto
|
|
|
|
// the stack first. Then convert those stack values
|
|
|
|
// the stack first. Then convert those stack values
|
|
|
|
// into an appropriate C type.
|
|
|
|
// into an appropriate C type.
|
|
|
|
|
|
|
|
lua_getfield(L, 1, "accelerator"); |
|
|
|
lua_getfield(L, 1, "menu"); |
|
|
|
lua_getfield(L, 1, "menu"); |
|
|
|
lua_getfield(L, 1, "callback"); |
|
|
|
lua_getfield(L, 1, "callback"); |
|
|
|
// stack now has following:
|
|
|
|
// stack now has following:
|
|
|
|
// 1 = {"menu"="MenuName", callback="functionName"}
|
|
|
|
// 1 = {"menu"="MenuName", callback="functionName", accelerator="<Control>a"}
|
|
|
|
|
|
|
|
// -3 = "<Control>a"
|
|
|
|
// -2 = "MenuName"
|
|
|
|
// -2 = "MenuName"
|
|
|
|
// -1 = "functionName"
|
|
|
|
// -1 = "functionName"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const char* accelerator = luaL_optstring(L, -3, NULL); |
|
|
|
const char* menu = luaL_optstring(L, -2, NULL); |
|
|
|
const char* menu = luaL_optstring(L, -2, NULL); |
|
|
|
const char* callback = luaL_optstring(L, -1, NULL); |
|
|
|
const char* callback = luaL_optstring(L, -1, NULL); |
|
|
|
if (callback == NULL) |
|
|
|
if (callback == NULL) |
|
|
|
{ |
|
|
|
{ |
|
|
|
luaL_error(L, "Missing callback function!"); |
|
|
|
luaL_error(L, "Missing callback function!"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (menu == NULL) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
menu = ""; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (accelerator == NULL) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
accelerator = ""; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
int menuId = -1; |
|
|
|
int menuId = -1; |
|
|
|
int toolbarId = -1; |
|
|
|
int toolbarId = -1; |
|
|
|
|
|
|
|
|
|
|
|
if (menu) |
|
|
|
if (menu) |
|
|
|
{ |
|
|
|
{ |
|
|
|
menuId = plugin->registerMenu(menu, callback); |
|
|
|
menuId = plugin->registerMenu(menu, callback, accelerator); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Make sure to remove all vars which are put to the stack before!
|
|
|
|
// Make sure to remove all vars which are put to the stack before!
|
|
|
|
lua_pop(L, 2); |
|
|
|
lua_pop(L, 3); |
|
|
|
|
|
|
|
|
|
|
|
// Add return value to the Stack
|
|
|
|
// Add return value to the Stack
|
|
|
|
lua_createtable(L, 0, 2); |
|
|
|
lua_createtable(L, 0, 2); |
|
|
|
@ -119,10 +125,10 @@ static const luaL_Reg applib[] = { |
|
|
|
{ "registerUi", applib_registerUi }, |
|
|
|
{ "registerUi", applib_registerUi }, |
|
|
|
|
|
|
|
|
|
|
|
// Placeholder
|
|
|
|
// Placeholder
|
|
|
|
{"MSG_BT_OK", NULL}, |
|
|
|
// {"MSG_BT_OK", NULL},
|
|
|
|
{"MSG_BT_YES", NULL}, |
|
|
|
// {"MSG_BT_YES", NULL},
|
|
|
|
{"MSG_BT_NO", NULL}, |
|
|
|
// {"MSG_BT_NO", NULL},
|
|
|
|
{"MSG_BT_CANCEL", NULL}, |
|
|
|
// {"MSG_BT_CANCEL", NULL},
|
|
|
|
|
|
|
|
|
|
|
|
{NULL, NULL} |
|
|
|
{NULL, NULL} |
|
|
|
}; |
|
|
|
}; |
|
|
|
@ -133,14 +139,14 @@ static const luaL_Reg applib[] = { |
|
|
|
LUAMOD_API int luaopen_app(lua_State* L) |
|
|
|
LUAMOD_API int luaopen_app(lua_State* L) |
|
|
|
{ |
|
|
|
{ |
|
|
|
luaL_newlib(L, applib); |
|
|
|
luaL_newlib(L, applib); |
|
|
|
lua_pushnumber(L, MSG_BT_OK); |
|
|
|
// lua_pushnumber(L, MSG_BT_OK);
|
|
|
|
lua_setfield(L, -2, "MSG_BT_OK"); |
|
|
|
// lua_setfield(L, -2, "MSG_BT_OK");
|
|
|
|
lua_pushnumber(L, MSG_BT_YES); |
|
|
|
// lua_pushnumber(L, MSG_BT_YES);
|
|
|
|
lua_setfield(L, -2, "MSG_BT_YES"); |
|
|
|
// lua_setfield(L, -2, "MSG_BT_YES");
|
|
|
|
lua_pushnumber(L, MSG_BT_NO); |
|
|
|
// lua_pushnumber(L, MSG_BT_NO);
|
|
|
|
lua_setfield(L, -2, "MSG_BT_NO"); |
|
|
|
// lua_setfield(L, -2, "MSG_BT_NO");
|
|
|
|
lua_pushnumber(L, MSG_BT_CANCEL); |
|
|
|
// lua_pushnumber(L, MSG_BT_CANCEL);
|
|
|
|
lua_setfield(L, -2, "MSG_BT_CANCEL"); |
|
|
|
// lua_setfield(L, -2, "MSG_BT_CANCEL");
|
|
|
|
return 1; |
|
|
|
return 1; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
andreasb242
7 years ago
committed by
GitHub