CComponents: rework some members

*rename col_text to class relevant names,
 col_text is already defined in class CComponents InfoBox and
 its easy to confuse member names
*add member printItemBox() and
 move calculateElements() into CComponentsItemBox and use it
 in print() and refreshElement()

src/gui/components/cc.h

@@ -241,7 +241,7 @@ class CComponentsInfoBox : public CComponentsContainer
 		void paintText();
 		void initVarInfobox();
 		std::string pic_name;
-		fb_pixel_t col_text;
+		fb_pixel_t ibox_col_text;
 	public:
 		CComponentsInfoBox();
 		CComponentsInfoBox(	const int x_pos, const int y_pos, const int w, const int h,
@@ -256,7 +256,7 @@ class CComponentsInfoBox : public CComponentsContainer
 		void setText(neutrino_locale_t locale_text, const int mode = CTextBox::AUTO_WIDTH, Font* font_text = NULL);
 		inline void setTextMode(const int mode){text_mode = mode;};//see textbox.h for possible modes
 		inline void setTextFont(Font* font_text){font = font_text;};
-		inline void setTextColor(fb_pixel_t color_text){ col_text = color_text;};
+		inline void setTextColor(fb_pixel_t color_text){ ibox_col_text = color_text;};
 		inline void setSpaceOffset(const int offset){x_offset = offset;};
 		inline void setPicture(const std::string& picture_name){pic_name = picture_name;};
 		void removeLineBreaks(std::string& str);
@@ -331,7 +331,7 @@ class CComponentsItemBox : public CComponentsContainer
 		int digit_offset, digit_h;
 		bool paintElements;
 		bool onlyOneTextElement;
-		fb_pixel_t col_text;
+		fb_pixel_t it_col_text;
 		Font* font_text;
 		int hMax;
 		bool has_TextElement;
@@ -345,15 +345,15 @@ class CComponentsItemBox : public CComponentsContainer
 		void initVarItemBox();
 		void calSizeOfElements();
 		void calPositionOfElements();
+		void paintItemBox(bool do_save_bg = CC_SAVE_SCREEN_YES);
+		void calculateElements();
 
 	public:
 		CComponentsItemBox();
 		virtual ~CComponentsItemBox();
 
 		inline virtual void setTextFont(Font* font){font_text = font;};
-		inline virtual void setTextColor(fb_pixel_t color_text){ col_text = color_text;};
+		inline virtual void setTextColor(fb_pixel_t color_text){ it_col_text = color_text;};
-
-		void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
 
 		virtual bool addElement(int align, int type, const std::string& element="", size_t *index=NULL);
 		virtual void refreshElement(size_t index, const std::string& element);
@@ -370,7 +370,7 @@ class CComponentsTitleBar : public CComponentsItemBox
 		std::string tb_s_text;
 		neutrino_locale_t tb_locale_text;
 		int tb_text_align;
-
+		
 		bool addText();
 		void initVarTitleBar();
 	
@@ -382,8 +382,8 @@ class CComponentsTitleBar : public CComponentsItemBox
 					fb_pixel_t color_text = COL_MENUHEAD, fb_pixel_t color_body = COL_MENUHEAD_PLUS_0);
 		CComponentsTitleBar(	const int x_pos, const int y_pos, const int w, const int h, neutrino_locale_t locale_text = NONEXISTANT_LOCALE, const int text_alignment = CC_ALIGN_LEFT,
 					fb_pixel_t color_text = COL_MENUHEAD, fb_pixel_t color_body = COL_MENUHEAD_PLUS_0);
-
+					
-		void calculateElements();
+		void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
 
 };
 

src/gui/components/components.cpp

@@ -288,7 +288,7 @@ CComponentsInfoBox::CComponentsInfoBox()
 	text 		= NULL;
 	text_mode	= CTextBox::AUTO_WIDTH;
 	font		= NULL;
-	col_text	= COL_MENUCONTENT;
+	ibox_col_text	= COL_MENUCONTENT;
 }
 
 CComponentsInfoBox::CComponentsInfoBox(const int x_pos, const int y_pos, const int w, const int h,
@@ -313,7 +313,7 @@ CComponentsInfoBox::CComponentsInfoBox(const int x_pos, const int y_pos, const i
 	text 		= info_text;
 	text_mode	= mode;
 	font		= font_text;
-	col_text	= color_text;
+	ibox_col_text	= color_text;
 }
 
 CComponentsInfoBox::~CComponentsInfoBox()
@@ -395,7 +395,7 @@ void CComponentsInfoBox::paintText()
 	//set properties
 	textbox->setTextFont(font);
 	textbox->movePosition(box->iX, box->iY);
-	textbox->setTextColor(col_text);
+	textbox->setTextColor(ibox_col_text);
 
 	//set text
 	string new_text = static_cast <string> (text);
@@ -823,7 +823,7 @@ void CComponentsItemBox::initVarItemBox()
 	initVarContainer();
 
 	//CComponentsItemBox
-	col_text 		= COL_MENUCONTENT;
+	it_col_text 		= COL_MENUCONTENT;
 	hSpacer 		= 2;
 	hOffset 		= 4;
 	vOffset 		= 1;
@@ -959,6 +959,7 @@ void CComponentsItemBox::refreshElement(size_t index, const std::string& element
 		default:
 			break;
 	}
+	calculateElements();
 }
 
 void CComponentsItemBox::paintElement(size_t index, bool newElement)
@@ -1015,13 +1016,13 @@ void CComponentsItemBox::paintElement(size_t index, bool newElement)
 			textbox->enableBackgroundPaint(false);
 			textbox->setTextFont(font_text);
 			textbox->movePosition(box->iX, box->iY);
-			textbox->setTextColor(col_text);
+			textbox->setTextColor(it_col_text);
 			if (textbox->setText(&v_element_data[index].element))
 				textbox->paint();
 			break;
 		case CC_ITEMBOX_CLOCK:
 			font_text->RenderString(v_element_data[index].x, v_element_data[index].y, v_element_data[index].width, 
-						v_element_data[index].element.c_str(), col_text);
+						v_element_data[index].element.c_str(), it_col_text);
 			break;
 		default:
 			break;
@@ -1119,146 +1120,7 @@ void CComponentsItemBox::calPositionOfElements()
 	}
 }
 
-void CComponentsItemBox::paint(bool do_save_bg)
+void CComponentsItemBox::calculateElements()
-{
-	// paint background
-	paintInit(do_save_bg);
-
-	if ((v_element_data.empty()) || (!paintElements))
-		return;
-
-	// paint elements
-	for (size_t i = 0; i < v_element_data.size(); i++)
-		paintElement(i);
-}
-
-void CComponentsItemBox::clearTitlebar()
-{
-	clearElements();
-	paintElements = false;
-	paint(false);
-	paintElements = true;
-}
-
-//-------------------------------------------------------------------------------------------------------
-//sub class CComponentsTitleBar from CComponentsItemBox
-CComponentsTitleBar::CComponentsTitleBar()
-{
-	//CComponentsTitleBar
-	initVarTitleBar();
-}
-
-CComponentsTitleBar::CComponentsTitleBar(const int x_pos, const int y_pos, const int w, const int h, const char* c_text, const int text_alignment,
-					fb_pixel_t color_text, fb_pixel_t color_body)
-{
-	//CComponentsItemBox
-	initVarTitleBar();
-	
-	//CComponents
-	x		= x_pos;
-	y 		= y_pos;
-	height		= h;
-	width 		= w;
-	col_body	= color_body;
-	
-	//CComponentsTitleBar
-	col_text 	= color_text;
-	tb_c_text	= c_text;
-	tb_text_align	= text_alignment;
-	
-	if (addText())
-		calculateElements();
-}
-
-CComponentsTitleBar::CComponentsTitleBar(const int x_pos, const int y_pos, const int w, const int h, const string& s_text, const int text_alignment,
-					fb_pixel_t color_text, fb_pixel_t color_body)
-{
-	//CComponentsItemBox
-	initVarTitleBar();
-
-	//CComponents
-	x		= x_pos;
-	y 		= y_pos;
-	height		= h;
-	width 		= w;
-	col_body	= color_body;
-
-	//CComponentsTitleBar
-	col_text 	= color_text;
-	tb_s_text	= s_text;
-	tb_text_align	= text_alignment;
-
-	if (addText())
-		calculateElements();
-}
-
-CComponentsTitleBar::CComponentsTitleBar(const int x_pos, const int y_pos, const int w, const int h, neutrino_locale_t locale_text, const int text_alignment,
-					fb_pixel_t color_text, fb_pixel_t color_body)
-{
-	//CComponentsItemBox
-	initVarTitleBar();
-
-	//CComponents
-	x		= x_pos;
-	y 		= y_pos;
-	height		= h;
-	width 		= w;
-	col_body	= color_body;
-
-	//CComponentsTitleBar
-	col_text 	= color_text;
-	tb_locale_text	= locale_text;
-	tb_text_align	= text_alignment;
-
-	if (addText())
-		calculateElements();
-}
-
-bool CComponentsTitleBar::addText()
-{
-	if (tb_c_text){
-		addElement	(tb_text_align, CC_ITEMBOX_TEXT, tb_c_text);
-		return true;	
-	}
-	else if (!tb_s_text.empty()){
-		addElement	(tb_text_align, CC_ITEMBOX_TEXT, tb_s_text);
-		return true;
-	}
-	else if	(tb_locale_text != NONEXISTANT_LOCALE){
-		addElement	(tb_text_align, CC_ITEMBOX_TEXT, g_Locale->getText(tb_locale_text));
-		return true;
-	}
-	else
-		return false;
-}
-
-void CComponentsTitleBar::initVarTitleBar()
-{
-	//CComponentsItemBox
-	initVarItemBox();
-	onlyOneTextElement	= true;
-	
-	font_text	= g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
-	col_text 	= COL_MENUHEAD;
-	
-	//CComponents
-	x		= 0;
-	y 		= 0;
-	height		= font_text->getHeight() + 2*hSpacer;
-	width 		= frameBuffer->getScreenWidth(true);;
-	col_body	= COL_MENUHEAD_PLUS_0;
-	corner_type 	= CORNER_TOP;
-	corner_rad	= RADIUS_LARGE;
-
-	//CComponentsTitleBar
-	tb_text_align	= CC_ALIGN_LEFT;
-	tb_c_text	= NULL;
-	tb_s_text	= "";
-	tb_locale_text	= NONEXISTANT_LOCALE;
-}
-
-
-void CComponentsTitleBar::calculateElements()
 {
 	if (v_element_data.empty())
 		return;
@@ -1299,3 +1161,149 @@ void CComponentsTitleBar::calculateElements()
 
 	calPositionOfElements();
 }
+
+void CComponentsItemBox::paintItemBox(bool do_save_bg)
+{
+	// paint background
+	paintInit(do_save_bg);
+
+	if ((v_element_data.empty()) || (!paintElements))
+		return;
+
+	// paint elements
+	for (size_t i = 0; i < v_element_data.size(); i++)
+		paintElement(i);
+}
+
+void CComponentsItemBox::clearTitlebar()
+{
+	clearElements();
+	paintElements = false;
+	paint(false);
+	paintElements = true;
+}
+
+//-------------------------------------------------------------------------------------------------------
+//sub class CComponentsTitleBar from CComponentsItemBox
+CComponentsTitleBar::CComponentsTitleBar()
+{
+	//CComponentsTitleBar
+	initVarTitleBar();
+}
+
+CComponentsTitleBar::CComponentsTitleBar(const int x_pos, const int y_pos, const int w, const int h, const char* c_text, const int text_alignment,
+					fb_pixel_t color_text, fb_pixel_t color_body)
+{
+	//CComponentsItemBox
+	initVarTitleBar();
+	it_col_text 	= color_text;
+	
+	//CComponents
+	x		= x_pos;
+	y 		= y_pos;
+	height		= h;
+	width 		= w;
+	col_body	= color_body;
+	
+	//CComponentsTitleBar
+	tb_c_text	= c_text;
+	tb_text_align	= text_alignment;
+	
+	if (addText())
+		calculateElements();
+}
+
+CComponentsTitleBar::CComponentsTitleBar(const int x_pos, const int y_pos, const int w, const int h, const string& s_text, const int text_alignment,
+					fb_pixel_t color_text, fb_pixel_t color_body)
+{
+	//CComponentsItemBox
+	initVarTitleBar();
+	it_col_text 	= color_text;
+
+	//CComponents
+	x		= x_pos;
+	y 		= y_pos;
+	height		= h;
+	width 		= w;
+	col_body	= color_body;
+
+	//CComponentsTitleBar
+	tb_s_text	= s_text;
+	tb_text_align	= text_alignment;
+
+	if (addText())
+		calculateElements();
+}
+
+CComponentsTitleBar::CComponentsTitleBar(const int x_pos, const int y_pos, const int w, const int h, neutrino_locale_t locale_text, const int text_alignment,
+					fb_pixel_t color_text, fb_pixel_t color_body)
+{
+	//CComponentsItemBox
+	initVarTitleBar();
+	it_col_text 	= color_text;
+
+	//CComponents
+	x		= x_pos;
+	y 		= y_pos;
+	height		= h;
+	width 		= w;
+	col_body	= color_body;
+
+	//CComponentsTitleBar
+	tb_locale_text	= locale_text;
+	tb_text_align	= text_alignment;
+
+	if (addText())
+		calculateElements();
+}
+
+bool CComponentsTitleBar::addText()
+{
+	if (tb_c_text){
+		addElement	(tb_text_align, CC_ITEMBOX_TEXT, tb_c_text);
+		return true;	
+	}
+	else if (!tb_s_text.empty()){
+		addElement	(tb_text_align, CC_ITEMBOX_TEXT, tb_s_text);
+		return true;
+	}
+	else if	(tb_locale_text != NONEXISTANT_LOCALE){
+		addElement	(tb_text_align, CC_ITEMBOX_TEXT, g_Locale->getText(tb_locale_text));
+		return true;
+	}
+	else
+		return false;
+}
+
+void CComponentsTitleBar::initVarTitleBar()
+{
+	//CComponentsItemBox
+	initVarItemBox();
+	onlyOneTextElement	= true;
+	
+	font_text	= g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
+	it_col_text 	= COL_MENUHEAD;
+	
+	//CComponents
+	x		= 0;
+	y 		= 0;
+	height		= font_text->getHeight() + 2*hSpacer;
+	width 		= frameBuffer->getScreenWidth(true);;
+	col_body	= COL_MENUHEAD_PLUS_0;
+	corner_type 	= CORNER_TOP;
+	corner_rad	= RADIUS_LARGE;
+
+	//CComponentsTitleBar
+	tb_text_align	= CC_ALIGN_LEFT;
+	tb_c_text	= NULL;
+	tb_s_text	= "";
+	tb_locale_text	= NONEXISTANT_LOCALE;
+}
+
+
+void CComponentsTitleBar::paint(bool do_save_bg)
+{
+	calculateElements();
+	paintItemBox(do_save_bg);	
+}
+