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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 94d3ba6d1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-21 11:43:58 +02:00
parent e637fe38f9 f140be3486
commit d79f920a6b
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/components/cc_types.h
View File

@@ -201,12 +201,16 @@ typedef struct button_label_cc
#define CC_WIDTH_MIN CFrameBuffer::getInstance()->scale2Res(16) #define CC_WIDTH_MIN CFrameBuffer::getInstance()->scale2Res(16)
#define CC_HEIGHT_MIN CC_WIDTH_MIN #define CC_HEIGHT_MIN CC_WIDTH_MIN
//shadow defines
#define CC_SHADOW_OFF 0x0 #define CC_SHADOW_OFF 0x0
#define CC_SHADOW_RIGHT 0x2 #define CC_SHADOW_RIGHT 0x2
#define CC_SHADOW_BOTTOM 0x4 #define CC_SHADOW_BOTTOM 0x4
#define CC_SHADOW_CORNER_BOTTOM_LEFT 0x8 #define CC_SHADOW_CORNER_BOTTOM_LEFT 0x8
#define CC_SHADOW_CORNER_BOTTOM_RIGHT 0x10 #define CC_SHADOW_CORNER_BOTTOM_RIGHT 0x10
#define CC_SHADOW_CORNER_TOP_RIGHT 0x20 #define CC_SHADOW_CORNER_TOP_RIGHT 0x20
//prepared combined shadow defines
#define CC_SHADOW_RIGHT_CORNER_ALL CC_SHADOW_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT
#define CC_SHADOW_BOTTOM_CORNER_ALL CC_SHADOW_BOTTOM | CC_SHADOW_CORNER_BOTTOM_RIGHT | CC_SHADOW_CORNER_BOTTOM_LEFT
#define CC_SHADOW_ON CC_SHADOW_RIGHT | CC_SHADOW_BOTTOM | CC_SHADOW_CORNER_BOTTOM_LEFT | CC_SHADOW_CORNER_BOTTOM_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT #define CC_SHADOW_ON CC_SHADOW_RIGHT | CC_SHADOW_BOTTOM | CC_SHADOW_CORNER_BOTTOM_LEFT | CC_SHADOW_CORNER_BOTTOM_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT
#define CC_SAVE_SCREEN_YES true #define CC_SAVE_SCREEN_YES true

2
src/gui/epgplus.cpp
View File

@@ -1443,7 +1443,7 @@ void EpgPlus::paint()
this->maxNumberOfDisplayableEntries, this->maxNumberOfDisplayableEntries,
this->selectedChannelEntry == NULL ? 0 : this->selectedChannelEntry->index); this->selectedChannelEntry == NULL ? 0 : this->selectedChannelEntry->index);
paintScrollBar(this->sliderX, this->sliderY, this->sliderWidth, this->sliderHeight, total_pages, current_page, CC_SHADOW_ON); paintScrollBar(this->sliderX, this->sliderY, this->sliderWidth, this->sliderHeight, total_pages, current_page, CC_SHADOW_RIGHT_CORNER_ALL);
} }
// -- EPG+ Menue Handler Class // -- EPG+ Menue Handler Class

4
src/gui/timerlist.cpp
View File

@@ -1388,7 +1388,7 @@ void CTimerList::paintHead()
if (header == NULL) if (header == NULL)
{ {
header = new CComponentsHeader(x, y, width, header_height, LOCALE_TIMERLIST_NAME, NEUTRINO_ICON_TIMER, CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT, NULL, CC_SHADOW_ON); header = new CComponentsHeader(x, y, width, header_height, LOCALE_TIMERLIST_NAME, NEUTRINO_ICON_TIMER, CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT, NULL, CC_SHADOW_ON);
header->enableClock(true, " %d.%m.%Y, %H:%M ", " %d.%m.%Y, %H %M ", true); header->enableClock(true, " %d.%m.%Y - %H:%M ", NULL, false);
} }
header->paint(CC_SAVE_SCREEN_NO); header->paint(CC_SAVE_SCREEN_NO);
} }
@@ -1401,7 +1401,7 @@ void CTimerList::paintFoot()
if (timer != NULL) if (timer != NULL)
{ {
//replace info button with dummy if timer is not type REC or ZAP //replace info button with dummy if timer is not type REC or ZAP
if (timer->eventType == CTimerd::TIMER_RECORD || timer->eventType == CTimerd::TIMER_ZAPTO) //NI if (timer->eventType == CTimerd::TIMER_RECORD || timer->eventType == CTimerd::TIMER_ZAPTO)
TimerListButtons[4].button = NEUTRINO_ICON_BUTTON_INFO_SMALL; TimerListButtons[4].button = NEUTRINO_ICON_BUTTON_INFO_SMALL;
else else
TimerListButtons[4].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; TimerListButtons[4].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;