Merge branch 'master' into pu/moviebrowser

Origin commit data
------------------
Commit: 8dfdcee894
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-31 (Mon, 31 Oct 2016)

src/gui/components/.gitignore

@@ -0,0 +1 @@
+/doc/html

src/gui/components/cc_frm_scrollbar.cpp

@@ -136,6 +136,8 @@ void CComponentsScrollBar::initSegments()
 
 	//calculate height of segment container
 	int h_seg_obj = height - 2*sb_up_obj->getHeight() - 3*append_y_offset;
+	if(h_seg_obj < 0)
+		h_seg_obj = 0;
 
 	//init segment container
 	if (sb_segments_obj == NULL){
@@ -154,6 +156,8 @@ void CComponentsScrollBar::initSegments()
 	//set y position of 1st segment and set height of segments
 	int y_seg = 1+ append_y_offset;
 	int h_seg = sb_segments_obj->getHeight()/sb_segments_count - append_y_offset;
+	if(h_seg < 0)
+		h_seg = 0;
 
 	//create and add segments to segment container
 	for(u_int8_t i=0; i<sb_segments_count; i++){

src/gui/infoviewer.cpp

@@ -445,6 +445,9 @@ void CInfoViewer::paintHead()
 void CInfoViewer::paintBody()
 {
 	int h_body = InfoHeightY - header_height - OFFSET_SHADOW;
+	if(h_body < 0)
+		h_body = 0;
+
 	infoViewerBB->initBBOffset();
 	if (!zap_mode)
 		h_body += infoViewerBB->bottom_bar_offset;

src/gui/scan_setup.cpp

@@ -1963,7 +1963,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
 	if(channel)
 		CServiceManager::getInstance()->GetTransponder(channel->getTransponderId(), ct);
 
-	int i = 0;
+	int i = menu.getItemsCount();
 	transponder_list_t &select_transponders = CServiceManager::getInstance()->GetSatelliteTransponders(position);
 	for (transponder_list_t::iterator tI = select_transponders.begin(); tI != select_transponders.end(); ++tI) {
 		sprintf(cnt, "%d", i);

src/gui/widget/.gitignore

@@ -0,0 +1 @@
+/doc/html