mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cb151e760
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-24 01:06:20 +02:00
parent c98f6711e7 78acdd764d
commit b23e35d092
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/components/cc_frm_signalbars.cpp
View File

@@ -339,10 +339,9 @@ void CSignalBox::paintScale()
void CSignalBox::paint(bool do_save_bg) void CSignalBox::paint(bool do_save_bg)
{ {
//paint frame and body //paint frame and body
if (!is_painted){
initSignalItems(); initSignalItems();
if (!is_painted)
paintForm(do_save_bg); paintForm(do_save_bg);
}
//paint current signal value //paint current signal value
paintScale(); paintScale();

5
src/gui/components/cc_frm_signalbars.h
View File

@@ -296,7 +296,10 @@ class CSignalBox : public CComponentsForm, public CCTextScreen
///returns the signal object, type = CSignalBar* ///returns the signal object, type = CSignalBar*
CSignalBar* getScaleObject(){return sbar;}; CSignalBar* getScaleObject(){return sbar;};
///returns the signal noise ratio object, type = CSignalNoiseRatioBar* ///returns the signal noise ratio object, type = CSignalNoiseRatioBar*
CSignalNoiseRatioBar* getLabelObject(){return snrbar;}; CSignalNoiseRatioBar* getLabelObject(){return snrbar;}
///assigns the current used frontend, simplified a tuner object, see frontend_c.h
void setFrontEnd(CFrontend *frontend_ref){sbx_frontend = frontend_ref;}
///sets the caption color of signalbars, see also property 'sbx_caption_color' ///sets the caption color of signalbars, see also property 'sbx_caption_color'
void setTextColor(const fb_pixel_t& caption_color){ sbx_caption_color = caption_color;}; void setTextColor(const fb_pixel_t& caption_color){ sbx_caption_color = caption_color;};

2
src/gui/imageinfo_ni.cpp
View File

@@ -34,7 +34,7 @@
#include <driver/fontrenderer.h> #include <driver/fontrenderer.h>
#include <driver/rcinput.h> #include <driver/rcinput.h>
#include <driver/screen_max.h> #include <driver/screen_max.h>
#include <driver/vfd.h> #include <driver/display.h>
#include <sys/utsname.h> #include <sys/utsname.h>

3
src/gui/infoviewer.cpp
View File

@@ -1747,7 +1747,8 @@ void CInfoViewer::showSNR ()
sigbox->setColorBody(numbox->getColorBody()); sigbox->setColorBody(numbox->getColorBody());
sigbox->doPaintBg(false); sigbox->doPaintBg(false);
sigbox->enableTboxSaveScreen(numbox->getColBodyGradientMode()); sigbox->enableTboxSaveScreen(numbox->getColBodyGradientMode());
} }else
sigbox->setFrontEnd(CFEManager::getInstance()->getLiveFE());
sigbox->paint(CC_SAVE_SCREEN_NO); sigbox->paint(CC_SAVE_SCREEN_NO);
} }
if(showButtonBar) if(showButtonBar)

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

@@ -66,7 +66,7 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name); tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name);
tableLookup(L, "text", text); tableLookup(L, "text", text);
tableLookup(L, "icon", icon); tableLookup(L, "icon", icon);
lua_Integer timeout = -1, width = 450, return_default_on_timeout = 0, show_buttons = CMessageBox::mbAll, default_button = CMessageBox::mbrYes; lua_Integer timeout = -1, width = 450, return_default_on_timeout = 0, show_buttons = 0, default_button = 0;
tableLookup(L, "timeout", timeout); tableLookup(L, "timeout", timeout);
tableLookup(L, "width", width); tableLookup(L, "width", width);
tableLookup(L, "return_default_on_timeout", return_default_on_timeout); tableLookup(L, "return_default_on_timeout", return_default_on_timeout);
@@ -80,13 +80,13 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
{ "right", CMessageBox::mbBtnAlignRight }, { "right", CMessageBox::mbBtnAlignRight },
{ NULL, 0 } { NULL, 0 }
}; };
show_buttons = 0;
for (int i = 0; mb[i].name; i++) for (int i = 0; mb[i].name; i++)
if (!strcmp(mb[i].name, tmp.c_str())) { if (!strcmp(mb[i].name, tmp.c_str())) {
show_buttons |= mb[i].code; show_buttons |= mb[i].code;
break; break;
} }
} }
lua_pushstring(L, "buttons"); lua_pushstring(L, "buttons");
lua_gettable(L, -2); lua_gettable(L, -2);
for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 2)) { for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 2)) {
@@ -108,6 +108,8 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
} }
} }
lua_pop(L, 1); lua_pop(L, 1);
if ((show_buttons & 0xFF) == 0)
show_buttons |= CMessageBox::mbAll;
table_key mbr[] = { table_key mbr[] = {
{ "yes", CMessageBox::mbrYes }, { "yes", CMessageBox::mbrYes },
@@ -118,7 +120,6 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
{ NULL, 0 } { NULL, 0 }
}; };
if (tableLookup(L, "default", tmp)) { if (tableLookup(L, "default", tmp)) {
default_button = 0;
for (int i = 0; mbr[i].name; i++) for (int i = 0; mbr[i].name; i++)
if (!strcmp(mbr[i].name, tmp.c_str())) { if (!strcmp(mbr[i].name, tmp.c_str())) {
default_button = mbr[i].code; default_button = mbr[i].code;