mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsWindow: cleanup

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d35da1afb6
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-24 (Fri, 24 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2014-01-24 23:28:15 +01:00
parent 2e5247105b
commit 1af67b7da0
1 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/gui/components/cc_frm_window.cpp
View File

@@ -123,32 +123,39 @@ void CComponentsWindow::setWindowCaption(neutrino_locale_t locale_text, const in
void CComponentsWindow::initHeader() void CComponentsWindow::initHeader()
{ {
if (ccw_head == NULL){ if (ccw_head == NULL)
ccw_head = new CComponentsHeader(); ccw_head = new CComponentsHeader();
initHeader();
//add of header item happens initCCWItems() //add of header item happens initCCWItems()
}
//set header properties //TODO: assigned properties with internal header objekt have no effect! //set header properties //TODO: assigned properties with internal header objekt have no effect!
if (ccw_head){ if (ccw_head){
ccw_head->setWidth(width-2*fr_thickness); ccw_head->setWidth(width-2*fr_thickness);
// ccw_head->setPos(0, 0); // ccw_head->setPos(0, 0);
ccw_head->setIcon(ccw_icon_name); ccw_head->setIcon(ccw_icon_name);
ccw_head->setCaption(ccw_caption, ccw_align_mode); ccw_head->setCaption(ccw_caption, ccw_align_mode);
// ccw_head->initCCItems();
ccw_head->setDefaultButtons(ccw_buttons); ccw_head->setDefaultButtons(ccw_buttons);
ccw_head->setCorner(corner_rad, CORNER_TOP); ccw_head->setCorner(corner_rad, CORNER_TOP);
} }
} }
void CComponentsWindow::initFooter()
{
if (ccw_footer== NULL)
ccw_footer= new CComponentsFooter();
//add of footer item happens initCCWItems()
//set footer properties
if (ccw_footer){
ccw_footer->setPos(0, CC_APPEND);
ccw_footer->setWidth(width-2*fr_thickness);
ccw_footer->setShadowOnOff(shadow);
ccw_footer->setCorner(corner_rad, CORNER_BOTTOM);
}
}
void CComponentsWindow::initBody() void CComponentsWindow::initBody()
{ {
if (ccw_body== NULL){ if (ccw_body== NULL)
ccw_body = new CComponentsForm(); ccw_body = new CComponentsForm();
initBody();
//add of body item happens initCCWItems() //add of body item happens initCCWItems()
}
//set body properties //set body properties
if (ccw_body){ if (ccw_body){
ccw_body->setCornerType(0); ccw_body->setCornerType(0);
@@ -164,35 +171,16 @@ void CComponentsWindow::initBody()
} }
} }
void CComponentsWindow::initFooter()
{
if (ccw_footer== NULL){
ccw_footer= new CComponentsFooter();
initFooter();
//add of footer item happens initCCWItems()
}
//set footer properties
if (ccw_footer){
ccw_footer->setPos(0, CC_APPEND);
ccw_footer->setWidth(width-2*fr_thickness);
ccw_footer->setShadowOnOff(shadow);
ccw_footer->setCorner(corner_rad, CORNER_BOTTOM);
}
}
void CComponentsWindow::addWindowItem(CComponentsItem* cc_Item)
{
if (ccw_body)
ccw_body->addCCItem(cc_Item);
}
void CComponentsWindow::initCCWItems() void CComponentsWindow::initCCWItems()
{ {
#ifdef DEBUG_CC #ifdef DEBUG_CC
printf("[CComponentsWindow] [%s - %d] init items...\n", __func__, __LINE__); printf("[CComponentsWindow] [%s - %d] init items...\n", __func__, __LINE__);
#endif #endif
//add header if required initHeader();
initFooter();
initBody();
//add/remove header if required
if (ccw_show_header){ if (ccw_show_header){
initHeader(); initHeader();
}else{ }else{
@@ -202,7 +190,7 @@ void CComponentsWindow::initCCWItems()
} }
} }
//add footer if required //add/remove footer if required
if (ccw_show_footer){ if (ccw_show_footer){
initFooter(); initFooter();
}else{ }else{
@@ -211,7 +199,6 @@ void CComponentsWindow::initCCWItems()
ccw_footer = NULL; ccw_footer = NULL;
} }
} }
initBody();
//add header, body and footer items only one time //add header, body and footer items only one time
if (ccw_head) if (ccw_head)
@@ -224,6 +211,13 @@ void CComponentsWindow::initCCWItems()
addCCItem(ccw_footer); addCCItem(ccw_footer);
} }
void CComponentsWindow::addWindowItem(CComponentsItem* cc_Item)
{
if (ccw_body)
ccw_body->addCCItem(cc_Item);
}
void CComponentsWindow::paint(bool do_save_bg) void CComponentsWindow::paint(bool do_save_bg)
{ {
//prepare items before paint //prepare items before paint