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

- cc_frm_header: improve "fix neutrino locales in CComponentsHeader"

Browse Source 
* supplement to 4cc9e76
This commit is contained in:
svenhoefer
2013-05-26 23:27:23 +02:00
parent e492048eab
commit 784d8d3de2
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/components/cc_frm.h
View File

@@ -107,7 +107,6 @@ class CComponentsHeader : public CComponentsForm
CComponentsIconForm * cch_btn_obj; CComponentsIconForm * cch_btn_obj;
std::string cch_text; std::string cch_text;
const char* cch_icon_name; const char* cch_icon_name;
neutrino_locale_t cch_locale_text;
fb_pixel_t cch_col_text; fb_pixel_t cch_col_text;
Font* cch_font; Font* cch_font;
int cch_icon_x, cch_items_y, cch_text_x, ccif_width, cch_icon_w, cch_buttons, cch_btn_offset; int cch_icon_x, cch_items_y, cch_text_x, ccif_width, cch_icon_w, cch_buttons, cch_btn_offset;

8
src/gui/components/cc_frm_header.cpp
View File

@@ -79,7 +79,7 @@ CComponentsHeader::CComponentsHeader( const int x_pos, const int y_pos, const in
col_body = color_body; col_body = color_body;
col_shadow = color_shadow; col_shadow = color_shadow;
cch_locale_text = caption_locale; cch_text = g_Locale->getText(caption_locale);
cch_icon_name = icon_name; cch_icon_name = icon_name;
cch_buttons = buttons; cch_buttons = buttons;
@@ -106,7 +106,6 @@ void CComponentsHeader::initVarHeader()
cch_icon_name = NULL; cch_icon_name = NULL;
cch_btn_obj = NULL; cch_btn_obj = NULL;
cch_text = ""; cch_text = "";
cch_locale_text = NONEXISTANT_LOCALE;
cch_col_text = COL_MENUHEAD; cch_col_text = COL_MENUHEAD;
cch_items_y = 0; cch_items_y = 0;
cch_icon_x = 0; cch_icon_x = 0;
@@ -136,7 +135,7 @@ void CComponentsHeader::setHeaderText(const std::string& caption)
void CComponentsHeader::setHeaderText(neutrino_locale_t caption_locale) void CComponentsHeader::setHeaderText(neutrino_locale_t caption_locale)
{ {
cch_locale_text = caption_locale; cch_text = g_Locale->getText(caption_locale);
} }
void CComponentsHeader::setHeaderIcon(const char* icon_name) void CComponentsHeader::setHeaderIcon(const char* icon_name)
@@ -285,9 +284,6 @@ void CComponentsHeader::initCCHeaderText()
//set header text properties //set header text properties
if (cch_text_obj){ if (cch_text_obj){
if (cch_locale_text != NONEXISTANT_LOCALE)
cch_text_obj->setText(cch_locale_text, CTextBox::AUTO_WIDTH, cch_font);
else
cch_text_obj->setText(cch_text, CTextBox::AUTO_WIDTH, cch_font); cch_text_obj->setText(cch_text, CTextBox::AUTO_WIDTH, cch_font);
cch_text_obj->forceTextPaint(); //here required cch_text_obj->forceTextPaint(); //here required
cch_text_obj->setDimensionsAll(cch_text_x, cch_items_y, width-cch_icon_w-fr_thickness, height-2*fr_thickness); cch_text_obj->setDimensionsAll(cch_text_x, cch_items_y, width-cch_icon_w-fr_thickness, height-2*fr_thickness);