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

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
M. Liebmann
2017-03-13 09:56:04 +01:00
parent 2ed30486c4 3fa097ebb9
commit fa2fd94f77
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/components/cc_frm_footer.h
View File

@@ -29,18 +29,6 @@
#include <global.h> #include <global.h>
#include <gui/widget/buttons.h> //for compatibility with 'button_label' type #include <gui/widget/buttons.h> //for compatibility with 'button_label' type
//for 'button_label' type with string
typedef struct button_label_cc
{
const char * button;
std::string text;
neutrino_locale_t locale;
neutrino_msg_t directKey;
neutrino_msg_t directKeyAlt;
int btn_result;
int btn_alias;
button_label_cc(): text(std::string()), locale(NONEXISTANT_LOCALE){}
} button_label_cc_struct;
/*! /*!
CComponentsFooter, sub class of CComponentsHeader provides prepared container for footer CComponentsFooter, sub class of CComponentsHeader provides prepared container for footer

16
src/gui/components/cc_types.h
View File

@@ -175,6 +175,22 @@ typedef struct cc_string_ext_txt_t
Font* font; Font* font;
} cc_string_ext_txt_struct_t; } cc_string_ext_txt_struct_t;
//for 'button_label' type with string
typedef struct button_label_cc
{
const char * button;
std::string text;
neutrino_locale_t locale;
neutrino_msg_t directKey;
neutrino_msg_t directKeyAlt;
int btn_result;
int btn_alias;
std::string bg_image;
std::string hint;
button_label_cc(): button(NULL), text(std::string()), locale(NONEXISTANT_LOCALE){}
} button_label_cc_struct;
#define CC_WIDTH_MIN 16 #define CC_WIDTH_MIN 16
#define CC_HEIGHT_MIN 16 #define CC_HEIGHT_MIN 16