mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- rename BUTTON_TOP to BUTTON_UP; it isn't a top-button

Browse Source
This commit is contained in:
svenhoefer
2016-12-07 15:37:03 +01:00
parent 0842a7ac35
commit 0dc0789de8
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,8 +275,8 @@ void CComponentsHeader::addContextButton(const int& buttons)
addContextButton(NEUTRINO_ICON_BUTTON_OKAY); addContextButton(NEUTRINO_ICON_BUTTON_OKAY);
if (buttons & CC_BTN_MUTE) if (buttons & CC_BTN_MUTE)
addContextButton(NEUTRINO_ICON_BUTTON_MUTE); addContextButton(NEUTRINO_ICON_BUTTON_MUTE);
if (buttons & CC_BTN_TOP) if (buttons & CC_BTN_UP)
addContextButton(NEUTRINO_ICON_BUTTON_TOP); addContextButton(NEUTRINO_ICON_BUTTON_UP);
if (buttons & CC_BTN_DOWN) if (buttons & CC_BTN_DOWN)
addContextButton(NEUTRINO_ICON_BUTTON_DOWN); addContextButton(NEUTRINO_ICON_BUTTON_DOWN);
if (buttons & CC_BTN_LEFT) if (buttons & CC_BTN_LEFT)

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

@@ -182,7 +182,7 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
CC_BTN_MUTE_ZAP_INACTIVE = 0x200, CC_BTN_MUTE_ZAP_INACTIVE = 0x200,
CC_BTN_OKAY = 0x400, CC_BTN_OKAY = 0x400,
CC_BTN_MUTE = 0x800, CC_BTN_MUTE = 0x800,
CC_BTN_TOP = 0x1000, CC_BTN_UP = 0x1000,
CC_BTN_DOWN = 0x2000, CC_BTN_DOWN = 0x2000,
CC_BTN_LEFT = 0x4000, CC_BTN_LEFT = 0x4000,
CC_BTN_RIGHT = 0x8000, CC_BTN_RIGHT = 0x8000,

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_up_obj = sb_down_obj = NULL;
sb_segments_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_down_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_DOWN);
sb_segments_count = count; 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, paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_9,
installerMenue ? g_Locale->getText(LOCALE_MOTORCONTROL_CALC_POSITIONS) : g_Locale->getText(LOCALE_MOTORCONTROL_STEP_DECREASE)); 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_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_BLUE, g_Locale->getText(LOCALE_MOTORCONTROL_STEP_DRIVE));
paintLine(xpos1, xpos2, &ypos, width2, NEUTRINO_ICON_BUTTON_INFO_SMALL, g_Locale->getText(LOCALE_MOTORCONTROL_NETWORK)); 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 */ /* add scroll mode if needed */
if (h_lines > h_hint_obj){ if (h_lines > h_hint_obj){
txt_mode = text_mode | CTextBox::SCROLL; 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 */ /* 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_8 "8"
#define NEUTRINO_ICON_BUTTON_9 "9" #define NEUTRINO_ICON_BUTTON_9 "9"
#define NEUTRINO_ICON_BUTTON_TOP "up" #define NEUTRINO_ICON_BUTTON_UP "up"
#define NEUTRINO_ICON_BUTTON_TOP_SMALL "up_small" #define NEUTRINO_ICON_BUTTON_UP_SMALL "up_small"
#define NEUTRINO_ICON_BUTTON_RIGHT "right" #define NEUTRINO_ICON_BUTTON_RIGHT "right"
#define NEUTRINO_ICON_BUTTON_DOWN "down" #define NEUTRINO_ICON_BUTTON_DOWN "down"
#define NEUTRINO_ICON_BUTTON_DOWN_SMALL "down_small" #define NEUTRINO_ICON_BUTTON_DOWN_SMALL "down_small"