diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 430c467ee..0953d03b6 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -135,11 +135,6 @@ void CBEBouquetWidget::paintItems() paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, body_height, total_pages, current_page); } -void CBEBouquetWidget::paintBody() -{ - PaintBoxRel(x, y + header_height, width, body_height, COL_MENUCONTENT_PLUS_0, RADIUS_NONE, CORNER_NONE, CC_SHADOW_ON); -} - void CBEBouquetWidget::paintHead() { header.setCaption(LOCALE_BOUQUETLIST_HEAD); diff --git a/src/gui/bedit/bouqueteditor_bouquets.h b/src/gui/bedit/bouqueteditor_bouquets.h index 0e1e6325a..edb3a440f 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.h +++ b/src/gui/bedit/bouqueteditor_bouquets.h @@ -64,7 +64,7 @@ class CBEBouquetWidget : public CBEGlobals, public CMenuTarget, public CListHelp bool bouquetsChanged; void paintHead(); - void paintBody(); + void paintItem(int pos); void paintItems(); void paintFoot(); diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index 5417194f3..b398c5fb3 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -140,11 +140,6 @@ void CBEChannelWidget::paintItems() paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, body_height, total_pages, current_page); } -void CBEChannelWidget::paintBody() -{ - PaintBoxRel(x, y + header_height, width, body_height, COL_MENUCONTENT_PLUS_0, RADIUS_NONE, CORNER_NONE, CC_SHADOW_ON); -} - void CBEChannelWidget::paintHead() { header.setCaption(caption + (mode == CZapitClient::MODE_TV ? " - TV" : " - Radio")); diff --git a/src/gui/bedit/bouqueteditor_channels.h b/src/gui/bedit/bouqueteditor_channels.h index d6f64c055..8a1b16881 100644 --- a/src/gui/bedit/bouqueteditor_channels.h +++ b/src/gui/bedit/bouqueteditor_channels.h @@ -57,7 +57,7 @@ class CBEChannelWidget : public CBEGlobals, public CMenuTarget, public CListHelp unsigned int bouquet; void paintHead(); - void paintBody(); + void paintItem(int pos); void paintItems(); void paintFoot(); diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index c4be1fb8a..66a11dc3e 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -124,11 +124,6 @@ void CBEChannelSelectWidget::paintItems() paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, body_height, total_pages, current_page); } -void CBEChannelSelectWidget::paintBody() -{ - PaintBoxRel(x, y + header_height, width, body_height, COL_MENUCONTENT_PLUS_0, RADIUS_NONE, CORNER_NONE, CC_SHADOW_ON); -} - void CBEChannelSelectWidget::paintHead() { header.setCaption(caption + (mode == CZapitClient::MODE_TV ? " - TV" : " - Radio")); diff --git a/src/gui/bedit/bouqueteditor_chanselect.h b/src/gui/bedit/bouqueteditor_chanselect.h index 5766837b0..0bd20f880 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.h +++ b/src/gui/bedit/bouqueteditor_chanselect.h @@ -57,7 +57,7 @@ class CBEChannelSelectWidget : public CBEGlobals, public CMenuTarget, public CLi std::string caption; void paintHead(); - void paintBody(); + void paintItem(int pos); void paintItems(); void paintFoot(); diff --git a/src/gui/bedit/bouqueteditor_globals.cpp b/src/gui/bedit/bouqueteditor_globals.cpp index df21cc1a0..a09a8259f 100644 --- a/src/gui/bedit/bouqueteditor_globals.cpp +++ b/src/gui/bedit/bouqueteditor_globals.cpp @@ -109,6 +109,11 @@ void CBEGlobals::paintDetails(int pos, int current) } } +void CBEGlobals::paintBody() +{ + PaintBoxRel(x, y + header_height, width, body_height, COL_MENUCONTENT_PLUS_0, RADIUS_NONE, CORNER_NONE, CC_SHADOW_ON); +} + void CBEGlobals::hide() { frameBuffer->paintBackgroundBoxRel(x, y, width + OFFSET_SHADOW, height + OFFSET_SHADOW); diff --git a/src/gui/bedit/bouqueteditor_globals.h b/src/gui/bedit/bouqueteditor_globals.h index af2300155..bd071ba45 100644 --- a/src/gui/bedit/bouqueteditor_globals.h +++ b/src/gui/bedit/bouqueteditor_globals.h @@ -56,6 +56,8 @@ class CBEGlobals unsigned int items_count; int timeout; + void paintBody(); + virtual std::string getInfoText(int index) = 0; void paintDetails(int pos, int current); void killDetails();