From e2ca965ee9e8390413466398db2d69a0c88ec9ca Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 13 Mar 2017 09:45:38 +0100 Subject: [PATCH 1/3] CComponentsFooter: add bg_image to button_label_cc type --- src/gui/components/cc_frm_footer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/components/cc_frm_footer.h b/src/gui/components/cc_frm_footer.h index 5add6ffae..b2c7a9768 100644 --- a/src/gui/components/cc_frm_footer.h +++ b/src/gui/components/cc_frm_footer.h @@ -39,6 +39,7 @@ typedef struct button_label_cc neutrino_msg_t directKeyAlt; int btn_result; int btn_alias; + std::string bg_image; button_label_cc(): text(std::string()), locale(NONEXISTANT_LOCALE){} } button_label_cc_struct; From e777ecdfdb269d2420daccf60c03b922533112e3 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 13 Mar 2017 09:45:38 +0100 Subject: [PATCH 2/3] cc_types: move struct button_label_cc into cc_types.h --- src/gui/components/cc_frm_footer.h | 13 ------------- src/gui/components/cc_types.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/gui/components/cc_frm_footer.h b/src/gui/components/cc_frm_footer.h index b2c7a9768..3cc572605 100644 --- a/src/gui/components/cc_frm_footer.h +++ b/src/gui/components/cc_frm_footer.h @@ -29,19 +29,6 @@ #include #include //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; - std::string bg_image; - button_label_cc(): text(std::string()), locale(NONEXISTANT_LOCALE){} -} button_label_cc_struct; /*! CComponentsFooter, sub class of CComponentsHeader provides prepared container for footer diff --git a/src/gui/components/cc_types.h b/src/gui/components/cc_types.h index c76520bb8..a55c0f866 100644 --- a/src/gui/components/cc_types.h +++ b/src/gui/components/cc_types.h @@ -175,6 +175,21 @@ typedef struct cc_string_ext_txt_t Font* font; } 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; + button_label_cc(): text(std::string()), locale(NONEXISTANT_LOCALE){} +} button_label_cc_struct; + #define CC_WIDTH_MIN 16 #define CC_HEIGHT_MIN 16 From 3fa097ebb959e3e7cceaf94ec93be6c95d272630 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 13 Mar 2017 09:45:38 +0100 Subject: [PATCH 3/3] cc_types.h: expand button_label_cc with hint as descrpition for button --- src/gui/components/cc_types.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/components/cc_types.h b/src/gui/components/cc_types.h index a55c0f866..5f56ee181 100644 --- a/src/gui/components/cc_types.h +++ b/src/gui/components/cc_types.h @@ -187,7 +187,8 @@ typedef struct button_label_cc int btn_result; int btn_alias; std::string bg_image; - button_label_cc(): text(std::string()), locale(NONEXISTANT_LOCALE){} + std::string hint; + button_label_cc(): button(NULL), text(std::string()), locale(NONEXISTANT_LOCALE){} } button_label_cc_struct; #define CC_WIDTH_MIN 16