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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	data/icons/status/ca/Makefile.am
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/tan_green.png
	data/icons/status/ca/tan_white.png
	data/icons/status/ca/tan_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 1322c2de67
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-15 (Fri, 15 Dec 2017)
This commit is contained in:
vanhofen
2017-12-15 23:19:49 +01:00
parent 72afb8817b 70550ada22
commit efcb427f1a
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/components/cc_frm_footer.cpp
View File

@@ -107,8 +107,10 @@ void CComponentsFooter::initVarFooter( const int& x_pos, const int& y_pos, const
void CComponentsFooter::setButtonLabels(const struct button_label_cc * const content, const size_t& label_count, const int& chain_width, const int& label_width)
{
/* clean up before init */
if (btn_container)
btn_container->clear();
if (btn_container){
removeCCItem(btn_container);
btn_container = NULL;
}
if (label_count == 0)
return;

2
src/gui/infoviewer_bb.cpp
View File

@@ -743,10 +743,12 @@ void CInfoViewerBB::paint_ca_icon(int caid, const char *icon, int &icon_space_of
int py = g_InfoViewer->BoxEndY + OFFSET_INNER_SMALL;
int px = 0;
static std::map<int, std::pair<int,const char*> > icon_map;
const int icon_space = OFFSET_INNER_SMALL, icon_number = 12;
static int icon_offset[icon_number] = {0,0,0,0,0,0,0,0,0,0,0,0};
static int icon_sizeW [icon_number] = {0,0,0,0,0,0,0,0,0,0,0,0};
static bool init_flag = false;
if (!init_flag) {

17
src/gui/test_menu.cpp
View File

@@ -975,6 +975,22 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
DisplayInfoMessage("Info Test!");
return menu_return::RETURN_REPAINT;
}
else if (actionKey == "msgbox_alt_btn"){
CMsgBox msgBox("Variable buttontext...", "Msgbox Test");
msgBox.setShowedButtons(CMsgBox::mbNo | CMsgBox::mbYes);
msgBox.setButtonText(CMsgBox::mbNo, "Left Button");
msgBox.setButtonText(CMsgBox::mbYes, "Right Button");
msgBox.paint();
res = msgBox.exec();
msgBox.hide();
std::string msg_txt = "Return value of MsgBox test is ";
msg_txt += to_string(msgBox.getResult());
ShowHint("MsgBox test returns", msg_txt.c_str(), 700, 10, NULL, NULL, CComponentsHeader::CC_BTN_EXIT);
return res;
}
else if (actionKey == "footer_key"){
CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, "Footer-Key pressed. Press EXIT to return", 350, NULL, NULL, CComponentsHeader::CC_BTN_EXIT);
hintBox.setTimeOut(15);
@@ -1229,6 +1245,7 @@ void CTestMenu::showMsgTests(CMenuWidget *widget)
{
widget->addIntroItems();
widget->addItem(new CMenuForwarder("HintBox test!", true, NULL, this, "hintbox_test"));
widget->addItem(new CMenuForwarder("Other buttontext", true, NULL, this, "msgbox_alt_btn"));
widget->addItem(new CMenuSeparator(CMenuSeparator::STRING | CMenuSeparator::LINE, "MsgBox"));
widget->addItem(new CMenuForwarder("cancel on timeout", true, NULL, this, "msgbox_test_cancel_timeout"));
widget->addItem(new CMenuForwarder("yes no", true, NULL, this, "msgbox_test_yes_no"));