new setup option to display channels without EPG

31 files changed, 229 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index 1b932e0..c47422f 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ endif
 	msgfmt -c -o $@ $<
 
 $(I18Npot): PAGES $(PLUGINOBJS:%.o=%.cpp)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --omit-header -o $@ $(PLUGINOBJS:%.o=%.cpp) pages/*.cpp setup.h
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --omit-header -o $@ $(PLUGINOBJS:%.o=%.cpp) pages/*.cpp setup.h epg_events.h
 
 $(I18Npo): $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1f9b3f4..e7b207f 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,6 @@
+2008-11-19  Christian Wieninger  <cwieninger at gmx dot de>
+	* new setup option to display channels without EPG
+	
 2008-10-21  Christian Wieninger  <cwieninger at gmx dot de>
 	* edit_timer.ecpp: new menu entry to select a recording directory.
 	  requires epgsearch plugin.
diff --git a/epg_events.cpp b/epg_events.cpp
index 962fcfc..ac6bcaa 100644
--- a/epg_events.cpp
+++ b/epg_events.cpp
@@ -197,6 +197,22 @@ namespace vdrlive
 
 	/*
 	 * -------------------------------------------------------------------------
+	 * EmptyEvent
+	 * -------------------------------------------------------------------------
+	 */
+
+        EmptyEvent::EmptyEvent(std::string const &id, tChannelID const &channelID, const char* channelName) :
+	  EpgInfo(id, channelName),
+	  m_channelID(channelID)
+	{
+	}
+
+	EmptyEvent::~EmptyEvent()
+	{
+	}
+
+	/*
+	 * -------------------------------------------------------------------------
 	 * EpgEvents
 	 * -------------------------------------------------------------------------
 	 */
@@ -267,8 +283,16 @@ namespace vdrlive
 
 	EpgInfoPtr EpgEvents::CreateEpgInfo(cChannel const *chan, cEvent const *event, char const *idOverride)
 	{
-		string domId(idOverride ? idOverride : EncodeDomId(chan->GetChannelID(), event->EventID()));
-		return EpgInfoPtr(new EpgEvent(domId, event, chan->Name()));
+	  if (event)
+	    {
+	      string domId(idOverride ? idOverride : EncodeDomId(chan->GetChannelID(), event->EventID()));
+	      return EpgInfoPtr(new EpgEvent(domId, event, chan->Name()));
+	    }
+	  else if (LiveSetup().GetShowChannelsWithoutEPG())
+	    {
+	      string domId(idOverride ? idOverride : EncodeDomId(chan->GetChannelID(), 0));
+	      return EpgInfoPtr(new EmptyEvent(domId, chan->GetChannelID(), chan->Name()));
+	    }
 	}
 
 	EpgInfoPtr EpgEvents::CreateEpgInfo(string const &recid, cRecording const *recording, char const *caption)
diff --git a/epg_events.h b/epg_events.h
index 8678eef..6d59f8c 100644
--- a/epg_events.h
+++ b/epg_events.h
@@ -120,6 +120,34 @@ namespace vdrlive
 
 	// -------------------------------------------------------------------------
 
+	class EmptyEvent : public EpgInfo
+	{
+		friend class EpgEvents;
+
+		protected:
+			EmptyEvent(std::string const &id, tChannelID const &channelID, const char* channelName);
+
+		public:
+			virtual ~EmptyEvent();
+
+			virtual std::string const Title() const { return tr("no EPG available"); }
+
+			virtual std::string const ShortDescr() const { return ""; }
+
+			virtual std::string const LongDescr() const { return ""; }
+
+			virtual time_t GetStartTime() const { return 0; }
+
+			virtual time_t GetEndTime() const { return 0; }
+
+			virtual cChannel const * Channel() const { return Channels.GetByChannelID(m_channelID);}
+
+		private:
+			tChannelID m_channelID;
+	};
+
+	// -------------------------------------------------------------------------
+
 	class EpgRecording : public EpgInfo
 	{
 		friend class EpgEvents;
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index e8dd1fb..9222115 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -266,7 +266,7 @@ int update_status(1);
 	<& pageelems.event_timer epgid=(epgid) &>
 	<& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channelId) image="zap.png" alt="" &>
 <%cpp>
-		if (LiveFeatures<features::epgsearch>().Recent()) {
+		if (LiveFeatures<features::epgsearch>().Recent() && eventId != 0) {
 </%cpp>
 	<a href="searchresults.html?searchplain=<$ StringEscapeAndBreak(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a>
 <%cpp>
@@ -276,18 +276,27 @@ int update_status(1);
 	<& pageelems.vlc_stream_channel channelId=(channelId) &>
 <%cpp>
 		}
+	if (eventId != 0) {
 </%cpp>
-	<& pageelems.imdb_info_href title=(title) &>
+		<& pageelems.imdb_info_href title=(title) &>
 <%cpp>
+		}
 	}
 	else { // table output
 </%cpp>
 		<td class="action leftcol <? lastCurrentChanel ? "bottomrow"?>"><& pageelems.event_timer epgid=(epgid) &></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channelId) image="zap.png" alt="" &></td>
-		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if (LiveFeatures<features::epgsearch>().Recent()) { </%cpp><a href="searchresults.html?searchplain=<$ StringUrlEncode(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a><%cpp> } else { </%cpp><img src="transparent.png" width="16" height="16"><%cpp> } </%cpp></td>
+		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if (LiveFeatures<features::epgsearch>().Recent() && eventId != 0) { </%cpp><a href="searchresults.html?searchplain=<$ StringUrlEncode(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a><%cpp> } else { </%cpp><img src="transparent.png" width="16" height="16"><%cpp> } </%cpp></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if (LiveSetup().GetUseStreamdev() && elapsed > 0 && LiveFeatures<features::streamdev_server>().Loaded()) { </%cpp><a href="vlc.html?channel=<$ channelId $>"><img src="<$ LiveSetup().GetThemedLink("img", "stream_button.png") $>" alt="" <& tooltip.hint text=(tr("Stream this channel into browser.")) &>></img></a><%cpp> } else { </%cpp><img src="transparent.png" width="16" height="16"><%cpp> } </%cpp></td>
-		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><& pageelems.imdb_info_href title=(title) &></td>
+		<td class="action <? lastCurrentChanel ? "bottomrow"?>">
+<%cpp>
+			if (eventId != 0) { 
+</%cpp>
+			<& pageelems.imdb_info_href title=(title) &>
 <%cpp>
+			}
+</%cpp>		</td>
+<%cpp>		
 	}
 </%cpp>
 </%def>
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index d89acf0..cc1db8c 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -23,6 +23,7 @@ using namespace std;
 	string showInfoBox;
 	string useStreamdev;
 	string showIMDb;
+	string showChannelsWithoutEPG;
 	string streamdevport;
 	string streamdevtype;
 	int authchanged = 0;
@@ -65,6 +66,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 			LiveSetup().SetStreamdevPort(streamdevport.empty() ? 3000 : lexical_cast<int>(streamdevport));
 			LiveSetup().SetStreamdevType(streamdevtype.empty() ? "PES" : streamdevtype);
 			LiveSetup().SetShowIMDb(!showIMDb.empty());
+			LiveSetup().SetShowChannelsWithoutEPG(!showChannelsWithoutEPG.empty());
 			LiveSetup().SaveSetup();
 			message = tr("Setup saved.");
 		}
@@ -89,7 +91,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 	streamdevport = lexical_cast<std::string, int>(LiveSetup().GetStreamdevPort());
 	streamdevtype = LiveSetup().GetStreamdevType();
 	showIMDb = LiveSetup().GetShowIMDb() ? "1" : "";
-
+	showChannelsWithoutEPG = LiveSetup().GetShowChannelsWithoutEPG() ? "1" : "";
 </%cpp>
 <& pageelems.doc_type &>
 <html>
@@ -136,10 +138,6 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 						<td  class="toprow leftcol rightcol" colspan="2"><div class="boxheader"><div><div><$ tr("Setup") $></div></div></div></td>
 					</tr>
 					<tr>
-						<td class="label leftcol"><div class="withmargin"><$ tr("Last channel to display") $>:</div></td>
-						<td class="rightcol"><input type="text" name="lastchannel" value="<$ lastchannel $>" id="lastchannel" /></td>
-					</tr>
-					<tr>
 						<td class="label leftcol"><div class="withmargin"><$ tr("Use authentication") $>:</div></td>
 						<td class="rightcol">
 							<input type="checkbox" name="useauth" id="useauth" value="1" <%cpp> CHECKIF(useauth); </%cpp> onclick="changeduseauth(this)"/>
@@ -212,11 +210,22 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 						</td>
 					</tr>
 					<tr>
+						<td class="label leftcol"><div class="withmargin"><$ tr("Last channel to display") $>:</div></td>
+						<td class="rightcol"><input type="text" name="lastchannel" value="<$ lastchannel $>" id="lastchannel" /></td>
+					</tr>
+					<tr>
 						<td class="label leftcol"><div class="withmargin"><$ tr("additional fixed times in 'What's on?'") $>:</div></td>
 						<td class="rightcol"><input type="text" name="times" value="<$ times $>" id="times" />
 							<& tooltip.help text=(tr("Format is HH:MM. Separate multiple times with a semicolon")) &></td>
 					</tr>
 					<tr>
+						<td class="label leftcol"><div class="withmargin"><$ tr("Show channels without EPG") $>:</div></td>
+						<td class="rightcol">
+							<input type="checkbox" name="showChannelsWithoutEPG" id="showChannelsWithoutEPG" value="1" <%cpp> CHECKIF(!showChannelsWithoutEPG.empty()); </%cpp>/>
+						</td>
+					</tr>
+
+					<tr>
 						<td class="label leftcol"><div class="withmargin"><$ tr("Start page") $>:</div></td>
 						<td class="rightcol"><select name="startscreen" size="1" id="startscreen">
 							<option value="whatsonnow" <%cpp> SELECTIF(startscreen == "whatsonnow") </%cpp>><$ trVDR("What's on now?") $></option>
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 736d0ba..51312a1 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -129,9 +129,8 @@ if (type == "now") {
 					Event = Schedule->GetFollowingEvent();
 				else if (type == "at")
 					Event = Schedule->GetEventAround(seektime);
-				if (!Event) {
-					continue;
-				}
+
+				if (!Event && !LiveSetup().GetShowChannelsWithoutEPG()) continue;
 
 				EpgInfoPtr epgEvent = EpgEvents::CreateEpgInfo(Channel, Event);
 				eventList.push_back(epgEvent);
@@ -197,6 +196,9 @@ if (type == "now") {
 		} else { // mode == "list"
 			std::list<EpgInfoPtr>::iterator last = i;
 			bool lastCurrentChanel = (++last == eventList.end());
+			tChannelID chanId;
+			tEventID eventId;	       
+			EpgEvents::DecodeDomId(epgEvent->Id(), chanId, eventId);
 </%cpp>
 			<tr>
 				<& pageelems.epg_tool_box detail=(0) epgid=(epgEvent->Id()) title=(epgEvent->Title()) startTime=(epgEvent->GetStartTime()) endTime=(epgEvent->GetEndTime()) lastCurrentChanel=(lastCurrentChanel ? 1 : 0) &>
@@ -209,11 +211,16 @@ if (type == "now") {
 					</div>
 				</td>
 				<td class="topaligned <? lastCurrentChanel ? "bottomrow"?>">
-					<div class="more withmargin"><a
+					<div class="more withmargin">
+%					if (eventId != 0) {
+					     <a
 % 						if (!longDescription.empty()) {
 						<& tooltip.hint text=(longDescription) &><& tooltip.display domId=(epgEvent->Id()) &>
 %						}
 						><span class="title"><$ (epgEvent->Title()) $></span><br /><span class="short"><$ (epgEvent->ShortDescr()) $></span></a>
+%						} else {
+						<span class="title"><$ (epgEvent->Title()) $></span>   
+%						}
 					</div>
 				</td>
 				<td class="topaligned rightcol <? lastCurrentChanel ? "bottomrow"?>"><div class="station withmargin"><a 		href="schedule.html?channel=<$ chNumber $>" <& tooltip.hint text=(tr("View the schedule of this channel")) &>><$ (epgEvent->Caption()) $></a></div>
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 574b8ec..701809c 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -702,6 +702,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -797,3 +800,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index a513e0f..783759d 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -700,6 +700,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -795,3 +798,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index 38a0f62..85dc7e2 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -700,6 +700,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -795,3 +798,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index ec3f8be..0499a77 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -702,6 +702,9 @@ msgstr "zusätzliche Zeitpunkte in 'Was läuft?'"
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr "Format ist HH:MM. Mehrere Zeiten durch Semikolon trennen"
 
+msgid "Show channels without EPG"
+msgstr "Zeige Kanäle ohne EPG"
+
 msgid "Start page"
 msgstr "Startseite"
 
@@ -798,17 +801,5 @@ msgstr "Listenansicht"
 msgid "Live Interactive VDR Environment"
 msgstr ""
 
-#~ msgid "Stream into browser"
-#~ msgstr "Im Browser anzeigen"
-
-#~ msgid "Edit this"
-#~ msgstr "Timer editieren"
-
-#~ msgid "Timer conflicts detected! You should check the conflicting timers."
-#~ msgstr "Timer Konflikte entdeckt! Sie sollten die entsprechenden Timer prüfen."
-
-#~ msgid "Start"
-#~ msgstr "Start"
-
-#~ msgid "File"
-#~ msgstr "Datei"
+msgid "no EPG available"
+msgstr "kein EPG verfügbar"
diff --git a/po/el_GR.po b/po/el_GR.po
index d327f0f..49e4f20 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -700,6 +700,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -795,3 +798,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index 8ec2dc9..08e108a 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -700,6 +700,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -795,3 +798,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
index 30e8987..2c70f34 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -700,6 +700,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -795,3 +798,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 5e58344..a703361 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -701,6 +701,9 @@ msgstr "Lisäajankohdat 'Menossa?'-sivulle"
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr "Käytä HH:MM formaattia ja erota ajankohdat puolipisteellä"
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr "Aloitussivu"
 
@@ -798,6 +801,9 @@ msgstr "Listanäkymä"
 msgid "Live Interactive VDR Environment"
 msgstr "Interaktiivinen VDR-ympäristö"
 
+msgid "no EPG available"
+msgstr ""
+
 #~ msgid "Stream into browser"
 #~ msgstr "Suoratoisto selaimeen"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index d2f847d..978f36d 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -708,6 +708,9 @@ msgstr "périodes fixes additionnelles dans 'actuellement?'"
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr "Le format est HH:MM . Plusieurs périodes séparées avec un point-virgule"
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr "Page de départ"
 
@@ -808,6 +811,9 @@ msgstr "Vue en liste"
 msgid "Live Interactive VDR Environment"
 msgstr ""
 
+msgid "no EPG available"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Stream into browser"
 #~ msgstr "Diffusez cette chaîne vers le navigateur."
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 2575207..3742a6a 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -701,6 +701,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -796,3 +799,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index d3b7e1e..eeadbb7 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -701,6 +701,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -796,3 +799,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index 173b393..a8c3c8b 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -704,6 +704,9 @@ msgstr "Ore aggiuntive fisse menu \"In programmazione\""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr "Il formato è HH:MM. Separa le ore multiple con un punto e virgola"
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr "Pagina iniziale"
 
@@ -801,6 +804,9 @@ msgstr "Vedi come elenco"
 msgid "Live Interactive VDR Environment"
 msgstr "Ambiente interattivo LIVE per VDR"
 
+msgid "no EPG available"
+msgstr ""
+
 #~ msgid "Stream into browser"
 #~ msgstr "Trasmetti nel browser"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 3d21d0b..8b44049 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -707,6 +707,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -807,6 +810,9 @@ msgstr ""
 msgid "Live Interactive VDR Environment"
 msgstr ""
 
+msgid "no EPG available"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Start"
 #~ msgstr "Start na"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index b3fcef2..8378974 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -701,6 +701,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -796,3 +799,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 92e4d21..c34d2cc 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -700,6 +700,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -795,3 +798,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 3b856da..f00635f 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -700,6 +700,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -795,3 +798,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 5a5ec53..ba5307f 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -701,6 +701,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -796,3 +799,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 8394a2c..4f3fa84 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -700,6 +700,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -795,3 +798,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/sl_SI.po b/po/sl_SI.po
index c6b205d..ed85934 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -701,6 +701,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -796,3 +799,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index bda087d..c324623 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -701,6 +701,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -796,3 +799,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 9596298..c84a205 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -701,6 +701,9 @@ msgstr ""
 msgid "Format is HH:MM. Separate multiple times with a semicolon"
 msgstr ""
 
+msgid "Show channels without EPG"
+msgstr ""
+
 msgid "Start page"
 msgstr ""
 
@@ -796,3 +799,6 @@ msgstr ""
 
 msgid "Live Interactive VDR Environment"
 msgstr ""
+
+msgid "no EPG available"
+msgstr ""
diff --git a/setup.cpp b/setup.cpp
index ff4d356..2be03cd 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -40,7 +40,8 @@ Setup::Setup():
 		m_useStreamdev(1),
 		m_streamdevPort(3000),
 		m_streamdevType(),
-		m_showIMDb(1)
+		m_showIMDb(1),
+		m_showChannelsWithoutEPG(0)
 {
 	m_adminPasswordMD5 = "4:" + MD5Hash("live");
 	liveplugin = cPluginManager::GetPlugin("live");
@@ -123,6 +124,7 @@ bool Setup::ParseSetupEntry( char const* name, char const* value )
 	else if ( strcmp( name, "StreamdevType" ) == 0 ) { m_streamdevType = value; }
 	else if ( strcmp( name, "ScreenShotInterval" ) == 0 ) { m_screenshotInterval = atoi(value); }
 	else if ( strcmp( name, "ShowIMDb" ) == 0 ) { m_showIMDb = atoi(value); }
+	else if ( strcmp( name, "ShowChannelsWithoutEPG" ) == 0 ) { m_showChannelsWithoutEPG = atoi(value); }
 	else return false;
 	return true;
 }
@@ -266,6 +268,7 @@ bool Setup::SaveSetup()
 	liveplugin->SetupStore("StreamdevType", m_streamdevType.c_str());
 	liveplugin->SetupStore("ScreenShotInterval", m_screenshotInterval);
 	liveplugin->SetupStore("ShowIMDb", m_showIMDb);
+	liveplugin->SetupStore("ShowChannelsWithoutEPG", m_showChannelsWithoutEPG);
 
 	return true;
 }
diff --git a/setup.h b/setup.h
index c341a5e..1cf153f 100644
--- a/setup.h
+++ b/setup.h
@@ -61,6 +61,7 @@ class Setup
 		std::string const GetStreamdevType() const { return m_streamdevType; }
 		bool GetShowIMDb() const { return m_showIMDb != 0; }
 		std::string const GetEpgImageDir() { return m_epgimagedir; }
+		bool GetShowChannelsWithoutEPG() const { return m_showChannelsWithoutEPG != 0; }
 
 		void SetLastChannel(int lastChannel) { m_lastChannel = lastChannel; }
 		void SetAdminLogin(std::string const & login) { m_adminLogin = login; }
@@ -80,6 +81,7 @@ class Setup
 		void SetStreamdevPort(int port) { m_streamdevPort = port; }
 		void SetStreamdevType(std::string const & type) { m_streamdevType = type; }
 		void SetShowIMDb(bool show) { m_showIMDb = show ? 1 : 0; }
+		void SetShowChannelsWithoutEPG(bool show) { m_showChannelsWithoutEPG = show ? 1 : 0; }
 
 		bool SaveSetup();
 
@@ -130,6 +132,7 @@ class Setup
 		int m_streamdevPort;
 		std::string m_streamdevType;
 		int m_showIMDb;
+		int m_showChannelsWithoutEPG;
 
 		bool CheckServerPort();
 		bool CheckServerIps();
diff --git a/thread.cpp b/thread.cpp
index 8bd0584..bfbc6cb 100644
--- a/thread.cpp
+++ b/thread.cpp
@@ -46,7 +46,7 @@ void ServerThread::Action()
 {
 	try {
 #if TNTVERSION >= 1606
-		// tnt::Tntconfig tntconfig;
+	        // tnt::Tntconfig tntconfig;
 		// tntconfig.load(TntConfig::Get().GetConfigPath().c_str());
 		m_server.reset(new Tntnet());
 		//m_server->init(tntconfig);