mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ae7765460
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-09-27 14:30:28 +02:00
parent fa8fc40b60 85e3acf202
commit 093a970ca5
4 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -355,6 +355,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
CBEChannelWidget* channelWidget = new CBEChannelWidget(ChannelWidgetCaption, selected); CBEChannelWidget* channelWidget = new CBEChannelWidget(ChannelWidgetCaption, selected);
channelWidget->exec(this, ""); channelWidget->exec(this, "");
selected = channelWidget->getBouquet();
if (channelWidget->hasChanged()) if (channelWidget->hasChanged())
bouquetsChanged = true; bouquetsChanged = true;
delete channelWidget; delete channelWidget;

30
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -70,6 +70,8 @@ CBEChannelWidget::CBEChannelWidget(const std::string & Caption, unsigned int Bou
status_icon_width = std::max(status_icon_width, iw); status_icon_width = std::max(status_icon_width, iw);
frameBuffer->getIconSize(NEUTRINO_ICON_LOCK, &iw, &ih); frameBuffer->getIconSize(NEUTRINO_ICON_LOCK, &iw, &ih);
status_icon_width = std::max(status_icon_width, iw); status_icon_width = std::max(status_icon_width, iw);
header.addContextButton(CComponentsHeader::CC_BTN_LEFT | CComponentsHeader::CC_BTN_RIGHT);
} }
CBEChannelWidget::~CBEChannelWidget() CBEChannelWidget::~CBEChannelWidget()
@@ -416,6 +418,34 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
paintFoot(); paintFoot();
paintItems(); paintItems();
} }
else if (msg == CRCInput::RC_left || msg == CRCInput::RC_right)
{
unsigned int bouquet_size = g_bouquetManager->Bouquets.size();
if (msg == CRCInput::RC_left)
{
if (bouquet == 0)
bouquet = bouquet_size - 1;
else
bouquet--;
}
else
{
if (bouquet < bouquet_size - 1)
bouquet++;
else
bouquet = 0;
}
Channels = mode == CZapitClient::MODE_TV ? &(g_bouquetManager->Bouquets[bouquet]->tvChannels) : &(g_bouquetManager->Bouquets[bouquet]->radioChannels);
caption = g_bouquetManager->Bouquets[bouquet]->bFav ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : g_bouquetManager->Bouquets[bouquet]->Name;
selected = 0;
paintHead();
paintBody();
paintFoot();
paintItems();
}
else if (msg == CRCInput::RC_ok) else if (msg == CRCInput::RC_ok)
{ {
if (state == beDefault) if (state == beDefault)

1
src/gui/bedit/bouqueteditor_channels.h
View File

@@ -89,6 +89,7 @@ class CBEChannelWidget : public CBEGlobals, public CMenuTarget, public CListHelp
ZapitChannelList * Channels; ZapitChannelList * Channels;
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);
bool hasChanged(); bool hasChanged();
unsigned int getBouquet() { return bouquet; };
}; };
#endif #endif

14
src/gui/widget/menue.cpp
View File

@@ -1303,7 +1303,10 @@ void CMenuWidget::setMenuPos(const int& menu_width)
int scr_y = frameBuffer->getScreenY(); int scr_y = frameBuffer->getScreenY();
int scr_w = frameBuffer->getScreenWidth(); int scr_w = frameBuffer->getScreenWidth();
int scr_h = frameBuffer->getScreenHeight(); int scr_h = frameBuffer->getScreenHeight();
int real_h = full_height + OFFSET_INTER + hint_height + OFFSET_SHADOW; // full_height includes footer_height : see calcSize int hint_h = 0;
if (hint_height)
hint_h = OFFSET_INTER + hint_height + OFFSET_SHADOW;
int real_h = full_height + hint_h; // full_height includes footer_height : see calcSize
int x_old = x; int x_old = x;
int y_old = y; int y_old = y;
//configured positions //configured positions
@@ -1423,20 +1426,23 @@ void CMenuWidget::saveScreen()
return; return;
delete[] background; delete[] background;
saveScreen_height = full_height + OFFSET_INTER + hint_height + OFFSET_SHADOW; // full_height includes footer_height : see calcSize int hint_h = 0;
if (hint_height)
hint_h = OFFSET_INTER + hint_height + OFFSET_SHADOW;
saveScreen_height = full_height + hint_h; // full_height includes footer_height : see calcSize
saveScreen_width = full_width; saveScreen_width = full_width;
saveScreen_y = y; saveScreen_y = y;
saveScreen_x = x; saveScreen_x = x;
background = new fb_pixel_t [saveScreen_height * saveScreen_width]; background = new fb_pixel_t [saveScreen_height * saveScreen_width];
if(background) if(background)
frameBuffer->SaveScreen(saveScreen_x /*-DETAILSLINE_WIDTH*/, saveScreen_y, saveScreen_width, saveScreen_height, background); frameBuffer->SaveScreen(saveScreen_x, saveScreen_y, saveScreen_width, saveScreen_height, background);
} }
void CMenuWidget::restoreScreen() void CMenuWidget::restoreScreen()
{ {
if(background) { if(background) {
if(savescreen) if(savescreen)
frameBuffer->RestoreScreen(saveScreen_x /*-DETAILSLINE_WIDTH*/, saveScreen_y, saveScreen_width, saveScreen_height, background); frameBuffer->RestoreScreen(saveScreen_x, saveScreen_y, saveScreen_width, saveScreen_height, background);
} }
} }