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

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
parent 314932d2de 44378948a3
commit 17880c4125
320 changed files with 21291 additions and 13199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,12 +76,15 @@ void CComponentsFooter::initVarFooter( const int& x_pos, const int& y_pos, const
col_frame = color_frame;
col_body = color_body;
col_shadow = color_shadow;
col_body_gradient = false;
col_body_gradient = false; /*g_settings.theme.Foot_gradient*/; //TODO: not implemented at the moment
cc_body_gradient_direction = CFrameBuffer::gradientVertical;
cc_body_gradient_mode = CColorGradient::gradientDark2Light;
btn_auto_frame_col = false;
corner_rad = RADIUS_LARGE;
corner_type = CORNER_BOTTOM;
btn_contour = false;
btn_contour = false /*g_settings.theme.Button_gradient*/; //TODO: not implemented at the moment
ccf_btn_font = NULL;
chain = NULL;
@@ -139,21 +142,26 @@ void CComponentsFooter::setButtonLabels(const struct button_label_s * const cont
continue;
}
CComponentsButton *btn = new CComponentsButton(0, CC_CENTERED, w_btn_min, height-height/4, txt, btn_name);
CComponentsButton *btn = new CComponentsButton(0, CC_CENTERED, w_btn_min, height-height/(btn_contour ? 4 : 3), txt, btn_name);
btn->setButtonFont(ccf_btn_font);
btn->doPaintBg(btn_contour);
btn->setButtonEventMsg(content[i].btn_msg);
btn->setButtonResult(content[i].btn_result);
btn->setButtonAlias(content[i].btn_alias);
if (btn_name == NEUTRINO_ICON_BUTTON_RED)
btn->setColorFrame(COL_DARK_RED);
if (btn_name == NEUTRINO_ICON_BUTTON_GREEN)
btn->setColorFrame(COL_DARK_GREEN);
if (btn_name == NEUTRINO_ICON_BUTTON_YELLOW)
btn->setColorFrame(COL_OLIVE);
if (btn_name == NEUTRINO_ICON_BUTTON_BLUE)
btn->setColorFrame(COL_DARK_BLUE);
//set button frames to icon color, predefined for available color buttons
if (btn_auto_frame_col){
fb_pixel_t f_col = btn->getColorFrame();
if (btn_name == NEUTRINO_ICON_BUTTON_RED)
f_col = COL_DARK_RED;
if (btn_name == NEUTRINO_ICON_BUTTON_GREEN)
f_col = COL_DARK_GREEN;
if (btn_name == NEUTRINO_ICON_BUTTON_YELLOW)
f_col = COL_OLIVE;
if (btn_name == NEUTRINO_ICON_BUTTON_BLUE)
f_col = COL_DARK_BLUE;
btn->setColorFrame(f_col);
}
chain->addCCItem(btn);
@@ -215,7 +223,7 @@ void CComponentsFooter::setButtonLabels(const struct button_label * const conten
setButtonLabels(buttons, label_count, chain_width, label_width);
}
void CComponentsFooter::setButtonLabels(const vector<button_label_l>v_content, const int& chain_width, const int& label_width)
void CComponentsFooter::setButtonLabels(const vector<button_label_l> &v_content, const int& chain_width, const int& label_width)
{
size_t label_count = v_content.size();
button_label_l buttons[label_count];
@@ -231,7 +239,7 @@ void CComponentsFooter::setButtonLabels(const vector<button_label_l>v_content, c
setButtonLabels(buttons, label_count, chain_width, label_width);
}
void CComponentsFooter::setButtonLabels(const vector<button_label_s>v_content, const int& chain_width, const int& label_width)
void CComponentsFooter::setButtonLabels(const vector<button_label_s> &v_content, const int& chain_width, const int& label_width)
{
size_t label_count = v_content.size();
button_label_s buttons[label_count];