channellist: rework behaviour of green and blue button; ...

* blue key: switches now/next/primetime
* green key: switches eventlist/description (in favorites mode)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bb694c690
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-04 (Mon, 04 Mar 2019)

Origin message was:
------------------
- channellist: rework behaviour of green and blue button; ...

* blue key: switches now/next/primetime
* green key: switches eventlist/description (in favorites mode)


------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -273,6 +273,8 @@ camd_msg_start camd wird gestartet
 camd_msg_stop camd wird gestoppt
 camd_reset camd neu starten
 channellist.additional Zusatzinformationen
+channellist.additional_desc Beschreibung
+channellist.additional_list Event-Liste
 channellist.additional_off aus
 channellist.additional_on ein
 channellist.additional_on_minitv ein (mit MiniTV)

data/locale/english.locale

@@ -273,6 +273,8 @@ camd_msg_start camd will be started
 camd_msg_stop camd will be stopped
 camd_reset camd restart
 channellist.additional Additional informations
+channellist.additional_desc Description
+channellist.additional_list Event list
 channellist.additional_off off
 channellist.additional_on on
 channellist.additional_on_minitv on (with MiniTV)

src/gui/channellist.cpp

@@ -174,12 +174,12 @@ void CChannelList::updateEvents(unsigned int from, unsigned int to)
 		return;
 
 	CChannelEventList events;
-	if (displayNext) {
+	if (displayMode == DISPLAY_MODE_NEXT || displayMode == DISPLAY_MODE_PRIME) {
 		time_t atime = time(NULL);
-		if (g_settings.channellist_primetime && primetime)
+		if (displayMode == DISPLAY_MODE_PRIME)
 		{
 			struct tm * timeinfo;
-			timeinfo = localtime (&atime);
+			timeinfo = localtime(&atime);
 			timeinfo->tm_hour = 20;
 			timeinfo->tm_min = 0;
 			atime = mktime(timeinfo);
@@ -477,9 +477,8 @@ int CChannelList::doChannelMenu(void)
 
 int CChannelList::exec()
 {
-	displayNext = 0; // always start with current events
+	displayMode = DISPLAY_MODE_NOW; // always start with current events
-	displayList = 1; // always start with event list
+	descMode = false; // always start with event list
-	primetime  = 0;
 	int nNewChannel = show();
 	if ( nNewChannel > -1 && nNewChannel < (int) (*chanlist).size()) {
 		if(this->historyMode && (*chanlist)[nNewChannel]) {
@@ -619,7 +618,7 @@ int CChannelList::show()
 	new_zap_mode = g_settings.channellist_new_zap_mode;
 
 	calcSize();
-	displayNext = false;
+	displayMode = DISPLAY_MODE_NOW;
 
 	COSDFader fader(g_settings.theme.menu_Content_alpha);
 	fader.StartFadeIn();
@@ -759,7 +758,7 @@ int CChannelList::show()
 		else if (!empty && (msg == CRCInput::RC_up || (int)msg == g_settings.key_pageup ||
 				    msg == CRCInput::RC_down || (int)msg == g_settings.key_pagedown))
 		{
-			//NI displayList = 1;
+			//descMode = false;
 			int new_selected = UpDownKey((*chanlist), msg, listmaxshow, selected);
 			if (new_selected >= 0)
 				actzap = updateSelection(new_selected);
@@ -865,26 +864,9 @@ int CChannelList::show()
 				if (move_state != beMoving)
 					renameChannel();
 			} else {
-				//NI
+				displayMode++;
-				if (g_settings.channellist_additional && !displayNext)
+				if (displayMode == DISPLAY_MODE_MAX)
-					displayList = !displayList;
+					displayMode = DISPLAY_MODE_NOW;
-				if (displayList)
-					displayNext = !displayNext;
-//NI
-#if 0
-				if (g_settings.channellist_additional)
-					displayList = !displayList;
-				else
-				{
-					if (primetime && displayNext)
-						primetime = 0;
-					else
-					{
-						primetime = 0;
-						displayNext = !displayNext;
-					}
-				}
-#endif
 
 				paint();
 			}
@@ -904,15 +886,9 @@ int CChannelList::show()
 					oldselected = selected;
 					paint();
 				} else {
-					if (g_settings.channellist_primetime)
+					if (g_settings.channellist_additional)
 					{
-						if (displayNext && !primetime)
+						descMode = !descMode;
-							primetime = 1;
-						else
-						{
-							primetime = 1;
-							displayNext = !displayNext;
-						}
 						paint();
 					}
 				}
@@ -942,7 +918,10 @@ int CChannelList::show()
 		else if (!empty && ((msg == CRCInput::RC_info) || (msg == CRCInput::RC_help))) {
 			hide();
 			CChannelEvent *p_event=NULL;
-			if (displayNext)
+			// TODO: fix primetime
+			if (displayMode == DISPLAY_MODE_NOW)
+				p_event = &((*chanlist)[selected]->currentEvent);
+			else
 				p_event = &((*chanlist)[selected]->nextEvent);
 
 			if(p_event && p_event->eventID)
@@ -1631,10 +1610,10 @@ void CChannelList::paintDetails(int index)
 	bool colored_event_N = (g_settings.theme.colored_events_channellist == 2);
 
 	CChannelEvent *p_event = NULL;
-	if (displayNext)
+	if (displayMode == DISPLAY_MODE_NOW)
-		p_event = &(*chanlist)[index]->nextEvent;
-	else
 		p_event = &(*chanlist)[index]->currentEvent;
+	else
+		p_event = &(*chanlist)[index]->nextEvent;
 
 	if (/* !IS_WEBCHAN((*chanlist)[index]->getChannelID()) && */ p_event && !p_event->description.empty()) {
 		char cNoch[50] = {0}; // UTF-8
@@ -1642,15 +1621,18 @@ void CChannelList::paintDetails(int index)
 
 		struct		tm *pStartZeit = localtime(&p_event->startTime);
 		unsigned	seit = (time(NULL) - p_event->startTime + 30) / 60;
-		snprintf(cSeit, sizeof(cSeit), "%s %02d:%02d",(displayNext) ? g_Locale->getText(LOCALE_CHANNELLIST_START):g_Locale->getText(LOCALE_CHANNELLIST_SINCE), pStartZeit->tm_hour, pStartZeit->tm_min);
+		snprintf(cSeit, sizeof(cSeit), "%s %02d:%02d",(displayMode == DISPLAY_MODE_NOW) ? g_Locale->getText(LOCALE_CHANNELLIST_SINCE) : g_Locale->getText(LOCALE_CHANNELLIST_START), pStartZeit->tm_hour, pStartZeit->tm_min);
-		if (displayNext) {
+		if (displayMode == DISPLAY_MODE_NOW)
-			snprintf(cNoch, sizeof(cNoch), "(%d %s)", p_event->duration / 60, unit_short_minute);
+		{
-		} else {
 			int noch = (p_event->startTime + p_event->duration - time(NULL)) / 60;
-			if ((noch< 0) || (noch>=10000))
+			if ((noch < 0) || (noch >= 10000))
-				noch= 0;
+				noch = 0;
 			snprintf(cNoch, sizeof(cNoch), "(%u / %d %s)", seit, noch, unit_short_minute);
 		}
+		else
+		{
+			snprintf(cNoch, sizeof(cNoch), "(%d %s)", p_event->duration / 60, unit_short_minute);
+		}
 		int seit_len = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getRenderWidth(cSeit);
 		int noch_len = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getRenderWidth(cNoch);
 
@@ -1721,7 +1703,7 @@ void CChannelList::paintDetails(int index)
 		}
 		g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ OFFSET_INNER_MID, ypos_a + 2*fheight +fdescrheight, full_width - 3*OFFSET_INNER_MID, desc.c_str(), COL_MENUCONTENTDARK_TEXT);
 	}
-	else if( !displayNext && g_settings.channellist_foot == 1) { // next Event
+	else if (displayMode == DISPLAY_MODE_NOW && g_settings.channellist_foot == 1) { // next Event
 
 		CSectionsdClient::CurrentNextInfo CurrentNext;
 		CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getEpgID(), CurrentNext);
@@ -1771,10 +1753,10 @@ void CChannelList::paintAdditionals(int index)
 {
 	if (g_settings.channellist_additional)
 	{
-		if (displayList)
+		if (descMode)
-			paint_events(index);
-		else
 			showdescription(selected);
+		else
+			paint_events(index);
 	}
 }
 
@@ -1861,33 +1843,25 @@ void CChannelList::paintButtonBar(bool is_current)
 				}
 			} else
 			{
-				if (g_settings.channellist_primetime)
+				if (g_settings.channellist_additional)
 				{
-					if (displayNext && primetime)
+					if (descMode)
-						Button[bcnt].locale = LOCALE_INFOVIEWER_NOW;
+						Button[bcnt].locale = LOCALE_CHANNELLIST_ADDITIONAL_LIST;
 					else
-						Button[bcnt].locale = LOCALE_CHANNELLIST_PRIMETIME;
+						Button[bcnt].locale = LOCALE_CHANNELLIST_ADDITIONAL_DESC;
 				}
 				else
 					continue;
 			}
 		}
 		if (i == 3) {
-			//manage now/next button
+			//manage now/next/prime button
-			if (g_settings.channellist_additional) {
+			if (displayMode == DISPLAY_MODE_NOW)
-				//NI
-				if (displayNext)
-					Button[bcnt].locale = LOCALE_INFOVIEWER_NOW;
-				else if (displayList)
-					Button[bcnt].locale = LOCALE_FONTSIZE_CHANNELLIST_DESCR;
-				else
 				Button[bcnt].locale = LOCALE_INFOVIEWER_NEXT;
-			} else {
+			else if (displayMode == DISPLAY_MODE_NEXT)
-				if (displayNext && !primetime)
+				Button[bcnt].locale = LOCALE_CHANNELLIST_PRIMETIME;
+			else if (displayMode == DISPLAY_MODE_PRIME)
 				Button[bcnt].locale = LOCALE_INFOVIEWER_NOW;
-				else
-					Button[bcnt].locale = LOCALE_INFOVIEWER_NEXT;
-			}
 		}
 		if (i == 4) {
 			//manage record button
@@ -1895,14 +1869,20 @@ void CChannelList::paintButtonBar(bool is_current)
 				continue;
 			if (IS_WEBCHAN(channel_id))
 				continue;
-			if (!displayNext){
+			if (displayMode == DISPLAY_MODE_NOW)
-				if (do_record){
+			{
+				if (do_record)
+				{
 					Button[bcnt].locale = LOCALE_MAINMENU_RECORDING_STOP;
 					Button[bcnt].button = NEUTRINO_ICON_BUTTON_STOP;
-				} else if (is_current) {
+				}
+				else if (is_current)
+				{
 					Button[bcnt].locale = LOCALE_MAINMENU_RECORDING;
 					Button[bcnt].button = NEUTRINO_ICON_BUTTON_RECORD_ACTIVE;
-				} else {
+				}
+				else
+				{
 					Button[bcnt].locale = NONEXISTANT_LOCALE;
 					Button[bcnt].button = NEUTRINO_ICON_BUTTON_RECORD_INACTIVE;
 				}
@@ -1956,7 +1936,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
 	int i_radius	= RADIUS_NONE;
 
 	fb_pixel_t color;
-	fb_pixel_t ecolor; // we need one more color for displayNext
+	fb_pixel_t ecolor; // we need one more color for DISPLAY_MODE_NEXT
 	fb_pixel_t bgcolor;
 
 	getItemColors(color, bgcolor, i_selected, i_marked);
@@ -1975,7 +1955,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
 
 //NI
 #if 0
-	if (displayNext)
+	if (displayMode != DISPLAY_MODE_NOW)
 	{
 		/*
 		   I think it's unnecessary to change colors in this case.
@@ -2010,10 +1990,10 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
 		snprintf(tmp, sizeof(tmp), "%d", this->historyMode ? pos : chan->number);
 
 		CChannelEvent *p_event=NULL;
-		if (displayNext)
+		if (displayMode == DISPLAY_MODE_NOW)
-			p_event = &chan->nextEvent;
-		else
 			p_event = &chan->currentEvent;
+		else
+			p_event = &chan->nextEvent;
 
 		//record check
 		rec_mode = CRecordManager::getInstance()->GetRecordMode((*chanlist)[curr]->getChannelID());
@@ -2177,14 +2157,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
 
 			if (g_settings.theme.progressbar_design_channellist != CProgressBar::PB_OFF)
 			{
-				if(displayNext)
+				if (displayMode == DISPLAY_MODE_NOW)
-				{
-					struct tm *pStartZeit = localtime(&p_event->startTime);
-
-					snprintf(tmp, sizeof(tmp), "%02d:%02d", pStartZeit->tm_hour, pStartZeit->tm_min);
-					g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(x + OFFSET_INNER_MID + numwidth + OFFSET_INNER_MID, ypos + fheight, width - numwidth - SCROLLBAR_WIDTH - prg_offset - 2*OFFSET_INNER_MID, tmp, ecolor, fheight);
-				}
-				else
 				{
 					time_t jetzt=time(NULL);
 					int runningPercent = 0;
@@ -2197,6 +2170,13 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
 					pb.setValues(runningPercent, pb_width);
 					pb.paint();
 				}
+				else
+				{
+					struct tm *pStartZeit = localtime(&p_event->startTime);
+
+					snprintf(tmp, sizeof(tmp), "%02d:%02d", pStartZeit->tm_hour, pStartZeit->tm_min);
+					g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(x + OFFSET_INNER_MID + numwidth + OFFSET_INNER_MID, ypos + fheight, width - numwidth - SCROLLBAR_WIDTH - prg_offset - 2*OFFSET_INNER_MID, tmp, ecolor, fheight);
+				}
 			}
 
 			g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x + OFFSET_INNER_MID + numwidth + OFFSET_INNER_MID + prg_offset + OFFSET_INNER_MID, ypos + fheight, ch_name_len, nameAndDescription, color);
@@ -2214,11 +2194,14 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
 		else
 		{
 			if (g_settings.theme.progressbar_design_channellist != CProgressBar::PB_OFF)
+			{
+				if (displayMode == DISPLAY_MODE_NOW)
 				{
 					pb.setValues(0, pb_width);
 					pb.paint();
 				}
-			//name
+			}
+			// name
 			g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x + OFFSET_INNER_MID + numwidth + OFFSET_INNER_MID + prg_offset + OFFSET_INNER_MID, ypos + fheight, ch_name_len, nameAndDescription, color);
 		}
 		if (!firstpaint && curr == selected)
@@ -2234,10 +2217,10 @@ void CChannelList::updateVfd()
 
 	CZapitChannel* chan = (*chanlist)[selected];
 	CChannelEvent *p_event=NULL;
-	if (displayNext)
+	if (displayMode == DISPLAY_MODE_NOW)
-		p_event = &chan->nextEvent;
-	else
 		p_event = &chan->currentEvent;
+	else
+		p_event = &chan->nextEvent;
 
 	if (!(chan->currentEvent.description.empty())) {
 		char nameAndDescription[255];
@@ -2609,8 +2592,10 @@ void CChannelList::showdescription(int index)
 	std::string strEpisode = "";	// Episode title in case info1 gets stripped
 	ffheight = g_Font[eventFont]->getHeight();
 	CZapitChannel* chan = (*chanlist)[index];
-	CChannelEvent *p_event = &chan->currentEvent;
+	CChannelEvent *p_event=NULL;
-	if (displayNext && primetime)
+	if (displayMode == DISPLAY_MODE_NOW)
+		p_event = &chan->currentEvent;
+	else
 		p_event = &chan->nextEvent;
 	epgData.info1.clear();
 	epgData.info2.clear();
@@ -2733,7 +2718,7 @@ void CChannelList::editMode(bool enable)
 	if (!bouquet || !bouquet->zapitBouquet)
 		return;
 
-	displayNext = false;
+	displayMode = DISPLAY_MODE_NOW;
 	edit_state = enable;
 	printf("STATE: %s\n", edit_state ? "EDIT" : "SHOW");
 	bool tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV;

src/gui/channellist.h

@@ -57,6 +57,13 @@ enum {
 	LIST_MODE_LAST
 };
 
+enum {
+	DISPLAY_MODE_NOW = 0,
+	DISPLAY_MODE_NEXT,
+	DISPLAY_MODE_PRIME,
+	DISPLAY_MODE_MAX
+};
+
 enum {
 	CHANLIST_CANCEL = -1,
 	CHANLIST_CANCEL_ALL = -2,
@@ -129,9 +136,8 @@ private:
 	CEPGData		epgData;
 	bool historyMode;
 	bool vlist; // "virtual" list, not bouquet
-	bool displayNext;
+	int displayMode;
-	bool displayList;
+	bool descMode;
-	bool primetime;
 	bool minitv_is_active;
 
 	bool headerNew;

src/system/locals.h

@@ -300,6 +300,8 @@ typedef enum
 	LOCALE_CAMD_MSG_STOP,
 	LOCALE_CAMD_RESET,
 	LOCALE_CHANNELLIST_ADDITIONAL,
+	LOCALE_CHANNELLIST_ADDITIONAL_DESC,
+	LOCALE_CHANNELLIST_ADDITIONAL_LIST,
 	LOCALE_CHANNELLIST_ADDITIONAL_OFF,
 	LOCALE_CHANNELLIST_ADDITIONAL_ON,
 	LOCALE_CHANNELLIST_ADDITIONAL_ON_MINITV,

src/system/locals_intern.h

@@ -300,6 +300,8 @@ const char * locale_real_names[] =
 	"camd_msg_stop",
 	"camd_reset",
 	"channellist.additional",
+	"channellist.additional_desc",
+	"channellist.additional_list",
 	"channellist.additional_off",
 	"channellist.additional_on",
 	"channellist.additional_on_minitv",