CComponentsButton: add class with const char* parameters for icon names

Origin commit data
------------------
Commit: 2c87bb750a
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-01 (Thu, 01 May 2014)
This commit is contained in:
2014-05-01 21:49:31 +02:00
parent fffa7ece56
commit c6af819f8a
2 changed files with 45 additions and 1 deletions

View File

@@ -59,6 +59,31 @@ CComponentsButton::CComponentsButton( const int& x_pos, const int& y_pos, const
initVarButton(x_pos, y_pos, w, h, g_Locale->getText(cc_btn_capt_locale), icon_name, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow); initVarButton(x_pos, y_pos, w, h, g_Locale->getText(cc_btn_capt_locale), icon_name, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow);
} }
CComponentsButton::CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption, const char* icon_name,
CComponentsForm* parent,
bool selected,
bool enabled,
bool has_shadow,
fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow)
{
string _icon_name = icon_name == NULL ? "" : string(icon_name);
initVarButton(x_pos, y_pos, w, h, caption, _icon_name, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow);
}
CComponentsButton::CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const neutrino_locale_t& caption_locale, const char* icon_name,
CComponentsForm* parent,
bool selected,
bool enabled,
bool has_shadow,
fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow)
{
string _icon_name = icon_name == NULL ? "" : string(icon_name);
cc_btn_capt_locale = caption_locale;
initVarButton(x_pos, y_pos, w, h, g_Locale->getText(cc_btn_capt_locale), _icon_name, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow);
}
void CComponentsButton::initVarButton( const int& x_pos, const int& y_pos, const int& w, const int& h, void CComponentsButton::initVarButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption, const std::string& caption,
const std::string& icon_name, const std::string& icon_name,

View File

@@ -82,7 +82,8 @@ class CComponentsButton : public CComponentsFrmChain
public: public:
///basic constructor for button object with most needed params, no button icon is definied here ///basic constructor for button object with most needed params, no button icon is definied here
CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h, CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption, const std::string& icon_name = "", const std::string& caption,
const std::string& icon_name = "",
CComponentsForm *parent = NULL, CComponentsForm *parent = NULL,
bool selected = false, bool selected = false,
bool enabled = true, bool enabled = true,
@@ -98,6 +99,24 @@ class CComponentsButton : public CComponentsFrmChain
bool has_shadow = CC_SHADOW_OFF, bool has_shadow = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0); fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const neutrino_locale_t& caption_locale,
const char* icon_name = NULL,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption,
const char* icon_name = NULL,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
///set text color ///set text color
virtual void setButtonTextColor(fb_pixel_t caption_color){cc_btn_capt_col = caption_color;}; virtual void setButtonTextColor(fb_pixel_t caption_color){cc_btn_capt_col = caption_color;};