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

Merge branch 'check/pu-cc' into master

Browse Source 
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-04-06 14:28:16 +02:00
parent 5bba845cac 1589230f2e
commit ab5760e4de
42 changed files with 861 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/system/settings.h
View File

@@ -606,6 +606,15 @@ struct SNeutrinoSettings
std::string usermenu_text[BUTTON_MAX];
int usermenu[BUTTON_MAX][ITEM_MAX]; // (USER_ITEM) [button][position in Menue] = feature item
//progressbar arrangement for infobar
typedef enum
{
INFOBAR_PROGRESSBAR_ARRANGEMENT_DEFAULT = 0,
INFOBAR_PROGRESSBAR_ARRANGEMENT_BELOW_CH_NAME = 1,
INFOBAR_PROGRESSBAR_ARRANGEMENT_BELOW_CH_NAME_SMALL = 2,
INFOBAR_PROGRESSBAR_ARRANGEMENT_BETWEEN_EVENTS = 3
}INFOBAR_PROGRESSBAR_ARRANGEMENT_TYPES;
};
/* some default Values */