mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +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 
Origin commit data
------------------
Commit: 784a58e6d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)
This commit is contained in:
vanhofen
2016-12-07 15:40:19 +01:00
parent c29c3fc07f 8f55c83ce0
commit cb68f4ff0c
7 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/bouquetlist.cpp
View File

@@ -700,7 +700,8 @@ void CBouquetList::paintItem(int pos)
void CBouquetList::paintHead()
{
CComponentsHeader header(x, y, width, theight, name);
std::string icon = "";
CComponentsHeader header(x, y, width, theight, name, icon, CComponentsHeader::CC_BTN_LEFT | CComponentsHeader::CC_BTN_RIGHT | CComponentsHeader::CC_BTN_MENU);
header.paint(CC_SAVE_SCREEN_NO);
}

8
src/gui/components/cc_frm_header.cpp
View File

@@ -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)

6
src/gui/components/cc_frm_header.h
View File

@@ -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,

2
src/gui/components/cc_frm_scrollbar.cpp
View File

@@ -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;

2
src/gui/motorcontrol.cpp
View File

@@ -542,7 +542,7 @@ void CMotorControl::paintMenu()
paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_9,
installerMenue ? g_Locale->getText(LOCALE_MOTORCONTROL_CALC_POSITIONS) : g_Locale->getText(LOCALE_MOTORCONTROL_STEP_DECREASE));
paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_TOP, g_Locale->getText(LOCALE_MOTORCONTROL_POS_INCREASE));
paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_UP, g_Locale->getText(LOCALE_MOTORCONTROL_POS_INCREASE));
paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_DOWN, g_Locale->getText(LOCALE_MOTORCONTROL_POS_DECREASE));
paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_BLUE, g_Locale->getText(LOCALE_MOTORCONTROL_STEP_DRIVE));
paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_INFO_SMALL, g_Locale->getText(LOCALE_MOTORCONTROL_NETWORK));

2
src/gui/widget/hintbox.cpp
View File

@@ -273,7 +273,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
/* add scroll mode if needed */
if (h_lines > h_hint_obj){
txt_mode = text_mode | CTextBox::SCROLL;
ccw_buttons = ccw_buttons | CComponentsHeader::CC_BTN_TOP | CComponentsHeader::CC_BTN_DOWN;
ccw_buttons = ccw_buttons | CComponentsHeader::CC_BTN_UP | CComponentsHeader::CC_BTN_DOWN;
}
/* define y start position of infobox inside body */

4
src/gui/widget/icons.h
View File

@@ -57,8 +57,8 @@
#define NEUTRINO_ICON_BUTTON_8 "8"
#define NEUTRINO_ICON_BUTTON_9 "9"
#define NEUTRINO_ICON_BUTTON_TOP "up"
#define NEUTRINO_ICON_BUTTON_TOP_SMALL "up_small"
#define NEUTRINO_ICON_BUTTON_UP "up"
#define NEUTRINO_ICON_BUTTON_UP_SMALL "up_small"
#define NEUTRINO_ICON_BUTTON_RIGHT "right"
#define NEUTRINO_ICON_BUTTON_DOWN "down"
#define NEUTRINO_ICON_BUTTON_DOWN_SMALL "down_small"