mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'test/cst-next'

Browse Source 
Conflicts:
	src/gui/osdlang_setup.cpp
This commit is contained in:
Stefan Seyfried
2015-02-19 14:10:26 +01:00
parent 51bbb756e8 d1ca82ab44
commit 48fdfc5e5e
23 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ class CComponentsForm : public CComponentsItem
{
PG_SCROLL_M_UP_DOWN_KEY = 1,
PG_SCROLL_M_LEFT_RIGHT_KEY = 2,
PG_SCROLL_M_OFF = 4,
PG_SCROLL_M_OFF = 4
};
///enable/disable page scroll, parameter1 default enabled for up/down keys
virtual void enablePageScroll(const int& mode = PG_SCROLL_M_UP_DOWN_KEY){page_scroll_mode = mode;};

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

@@ -77,7 +77,7 @@ void CComponentsFrmChain::setDirection(int direction)
{
chn_direction = direction;
initChainItems();
};
}
void CComponentsFrmChain::initChainItems()
{

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

@@ -137,13 +137,13 @@ class CProgressBar : public CComponentsItem
PB_MATRIX, /* 0 */
PB_LINES_V, /* 1 */
PB_LINES_H, /* 2 */
PB_COLOR, /* 3 */
PB_COLOR /* 3 */
};
enum pb_type_t {
PB_REDLEFT = 0,
PB_REDRIGHT,
PB_TIMESCALE,
PB_TIMESCALE
};
void setType(pb_type_t type);