mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

CMsgBox: rework msgbox classes with Window class implementation

Browse Source 
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details
This commit is contained in:
Thilo Graf
2016-04-04 21:57:17 +02:00
parent b8cf8167f4
commit dde298b1b7
81 changed files with 1981 additions and 1697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/lua/lua_hintbox.cpp
View File

@@ -149,7 +149,7 @@ int CLuaInstHintbox::HintboxExec(lua_State *L)
res = messages_return::cancel_info;
else if (msg == CRCInput::RC_home)
res = messages_return::cancel_all;
else if ((D->b->has_scrollbar()) && ((msg == CRCInput::RC_up) || (msg == CRCInput::RC_down))) {
else if (/*(D->b->has_scrollbar()) &&*/ ((msg == CRCInput::RC_up) || (msg == CRCInput::RC_down))) {
if (msg == CRCInput::RC_up)
D->b->scroll_up();
else

2
src/gui/lua/lua_menue.cpp
View File

@@ -28,7 +28,7 @@
#include <global.h>
#include <gui/widget/keyboard_input.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/msgbox.h>
#include <gui/filebrowser.h>
#include <system/debug.h>
#include <system/helpers.h>

36
src/gui/lua/lua_messagebox.cpp
View File

@@ -27,7 +27,7 @@
#include <global.h>
#include <system/debug.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/msgbox.h>
#include <neutrino.h>
#include "luainstance.h"
@@ -74,10 +74,10 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
std::string tmp;
if (tableLookup(L, "align", tmp)) {
table_key mb[] = {
{ "center1", CMessageBox::mbBtnAlignCenter1 },
{ "center2", CMessageBox::mbBtnAlignCenter2 },
{ "left", CMessageBox::mbBtnAlignLeft },
{ "right", CMessageBox::mbBtnAlignRight },
{ "center1", CMsgBox::mbBtnAlignCenter1 },
{ "center2", CMsgBox::mbBtnAlignCenter2 },
{ "left", CMsgBox::mbBtnAlignLeft },
{ "right", CMsgBox::mbBtnAlignRight },
{ NULL, 0 }
};
for (int i = 0; mb[i].name; i++)
@@ -93,12 +93,12 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
lua_pushvalue(L, -2);
const char *val = lua_tostring(L, -2);
table_key mb[] = {
{ "yes", CMessageBox::mbYes },
{ "no", CMessageBox::mbNo },
{ "cancel", CMessageBox::mbCancel },
{ "all", CMessageBox::mbAll },
{ "back", CMessageBox::mbBack },
{ "ok", CMessageBox::mbOk },
{ "yes", CMsgBox::mbYes },
{ "no", CMsgBox::mbNo },
{ "cancel", CMsgBox::mbCancel },
{ "all", CMsgBox::mbAll },
{ "back", CMsgBox::mbBack },
{ "ok", CMsgBox::mbOk },
{ NULL, 0 }
};
for (int i = 0; mb[i].name; i++)
@@ -109,14 +109,14 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
}
lua_pop(L, 1);
if ((show_buttons & 0xFF) == 0)
show_buttons |= CMessageBox::mbAll;
show_buttons |= CMsgBox::mbAll;
table_key mbr[] = {
{ "yes", CMessageBox::mbrYes },
{ "no", CMessageBox::mbrNo },
{ "cancel", CMessageBox::mbrCancel },
{ "back", CMessageBox::mbrBack },
{ "ok", CMessageBox::mbrOk },
{ "yes", CMsgBox::mbrYes },
{ "no", CMsgBox::mbrNo },
{ "cancel", CMsgBox::mbrCancel },
{ "back", CMsgBox::mbrBack },
{ "ok", CMsgBox::mbrOk },
{ NULL, 0 }
};
if (tableLookup(L, "default", tmp)) {
@@ -127,7 +127,7 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
}
}
int res = ShowMsg(name, text, (CMessageBox::result_) default_button, (CMessageBox::buttons_) show_buttons, icon.empty() ? NULL : icon.c_str(), width, timeout, return_default_on_timeout);
int res = ShowMsg(name, text, (CMsgBox::msg_result_t) default_button, (CMsgBox::button_define_t) show_buttons, icon.empty() ? NULL : icon.c_str(), width, timeout, return_default_on_timeout);
tmp = "cancel";
for (int i = 0; mbr[i].name; i++)

2
src/gui/lua/lua_messagebox.h
View File

@@ -25,7 +25,7 @@
class CLuaMessagebox
{
public:
CMessageBox *b;
CMsgBox *b;
CLuaMessagebox();
~CLuaMessagebox();
};

2
src/gui/lua/lua_misc.cpp
View File

@@ -27,7 +27,7 @@
#include <global.h>
#include <system/debug.h>
#include <gui/widget/menue.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/msgbox.h>
#include <driver/volume.h>
#include <gui/audiomute.h>
#include <gui/infoclock.h>

2
src/gui/lua/lua_video.cpp
View File

@@ -27,7 +27,7 @@
#include <global.h>
#include <system/debug.h>
#include <gui/movieplayer.h>
#include <gui/widget/messagebox.h>
#include <gui/widget/msgbox.h>
#include <zapit/zapit.h>
#include <video.h>
#include <neutrino.h>