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

CComponentsFooter: simplify implementation of button labels

Browse Source 
button_label_l and button_label_s are now
merged to button_label_cc with prepared default values for text and locales.This type contains all possible
button label properties. Values for locales and string
are evaluated in setButtonLabels(), so it's possible to remove some
overloaded methodes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c766a970dc
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-11 (Sat, 11 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-03-11 00:45:25 +01:00
parent e7daf551b3
commit 5368732f2f
4 changed files with 23 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/lua/lua_cc_window.cpp
View File

@@ -139,27 +139,27 @@ int CLuaInstCCWindow::CCWindowNew(lua_State *L)
else {
CComponentsFooter* footer = (*udata)->w->getFooterObject();
if (footer) {
vector<button_label_s> buttons;
vector<button_label_cc> buttons;
if (!btnRed.empty()) {
button_label_s btnSred;
button_label_cc btnSred;
btnSred.button = NEUTRINO_ICON_BUTTON_RED;
btnSred.text = btnRed;
buttons.push_back(btnSred);
}
if (!btnGreen.empty()) {
button_label_s btnSgreen;
button_label_cc btnSgreen;
btnSgreen.button = NEUTRINO_ICON_BUTTON_GREEN;
btnSgreen.text = btnGreen;
buttons.push_back(btnSgreen);
}
if (!btnYellow.empty()) {
button_label_s btnSyellow;
button_label_cc btnSyellow;
btnSyellow.button = NEUTRINO_ICON_BUTTON_YELLOW;
btnSyellow.text = btnYellow;
buttons.push_back(btnSyellow);
}
if (!btnBlue.empty()) {
button_label_s btnSblue;
button_label_cc btnSblue;
btnSblue.button = NEUTRINO_ICON_BUTTON_BLUE;
btnSblue.text = btnBlue;
buttons.push_back(btnSblue);