mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 784a58e6d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
This commit is contained in:
@@ -275,14 +275,14 @@ void CComponentsHeader::addContextButton(const int& buttons)
|
||||
addContextButton(NEUTRINO_ICON_BUTTON_OKAY);
|
||||
if (buttons & CC_BTN_MUTE)
|
||||
addContextButton(NEUTRINO_ICON_BUTTON_MUTE);
|
||||
if (buttons & CC_BTN_TOP)
|
||||
addContextButton(NEUTRINO_ICON_BUTTON_TOP);
|
||||
if (buttons & CC_BTN_UP)
|
||||
addContextButton(NEUTRINO_ICON_BUTTON_UP);
|
||||
if (buttons & CC_BTN_DOWN)
|
||||
addContextButton(NEUTRINO_ICON_BUTTON_DOWN);
|
||||
if (buttons & CC_BTN_RIGHT)
|
||||
addContextButton(NEUTRINO_ICON_BUTTON_RIGHT);
|
||||
if (buttons & CC_BTN_LEFT)
|
||||
addContextButton(NEUTRINO_ICON_BUTTON_LEFT);
|
||||
if (buttons & CC_BTN_RIGHT)
|
||||
addContextButton(NEUTRINO_ICON_BUTTON_RIGHT);
|
||||
if (buttons & CC_BTN_FORWARD)
|
||||
addContextButton(NEUTRINO_ICON_BUTTON_FORWARD);
|
||||
if (buttons & CC_BTN_BACKWARD)
|
||||
|
@@ -182,10 +182,10 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
|
||||
CC_BTN_MUTE_ZAP_INACTIVE = 0x200,
|
||||
CC_BTN_OKAY = 0x400,
|
||||
CC_BTN_MUTE = 0x800,
|
||||
CC_BTN_TOP = 0x1000,
|
||||
CC_BTN_UP = 0x1000,
|
||||
CC_BTN_DOWN = 0x2000,
|
||||
CC_BTN_RIGHT = 0x4000,
|
||||
CC_BTN_LEFT = 0x8000,
|
||||
CC_BTN_LEFT = 0x4000,
|
||||
CC_BTN_RIGHT = 0x8000,
|
||||
CC_BTN_FORWARD = 0x10000,
|
||||
CC_BTN_BACKWARD = 0x20000,
|
||||
CC_BTN_PAUSE = 0x40000,
|
||||
|
@@ -82,7 +82,7 @@ void CComponentsScrollBar::initVarSbForm(const int& count)
|
||||
sb_up_obj = sb_down_obj = NULL;
|
||||
sb_segments_obj = NULL;
|
||||
|
||||
sb_up_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_TOP) ;
|
||||
sb_up_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_UP) ;
|
||||
sb_down_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_DOWN);
|
||||
|
||||
sb_segments_count = count;
|
||||
|
Reference in New Issue
Block a user