New version 0.0.7v0.0.7

Added channel copy and reset functions

6 files changed, 75 insertions, 22 deletions

diff --git a/HISTORY b/HISTORY
index c5ed54a..98f79d0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,15 @@
 VDR Plugin 'infosatepg' Revision History
 ----------------------------------------
+2009-02-15: Version 0.0.7
+
+- Added patch from Keine_Ahnung
+- Extended status 
+- Added content handling
+- Changed setup channel option
+- Added extended EPG
+- Improved device chooser
+- Changed wakeup (now set automatically)
+
 2008-12-21: Version 0.0.6
 
 - Added WakeupTime
diff --git a/po/de_DE.po b/po/de_DE.po
index 74cd47a..d41aced 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2009-02-08 23:25+0100\n"
+"POT-Creation-Date: 2009-02-15 22:43+0100\n"
 "PO-Revision-Date: 2008-05-02 16:20+0200\n"
 "Last-Translator: Jochen Dolze <infosatepg@dolze.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -318,6 +318,12 @@ msgstr "Infosat Kanäle"
 msgid "used"
 msgstr "ausgewählt"
 
+msgid "Button$Reset"
+msgstr "Reset"
+
+msgid "Button$Copy"
+msgstr "Kopieren"
+
 msgid "Days in advance"
 msgstr "Anzahl Tage"
 
@@ -336,6 +342,12 @@ msgstr "Erweiterte EPG Infos"
 msgid "Append non existing events"
 msgstr "Erstelle neue Ereignisse"
 
+msgid "Reset all channel settings?"
+msgstr "Alle Kanäle zurücksetzen?"
+
+msgid "Copy settings to all channels?"
+msgstr "Einstellungen auf alle Kanäle kopieren?"
+
 msgid "Read EPG info from infosat"
 msgstr "Liest EPG infos von Infosat"
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 7c01b4e..c07951a 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vdr-1.6.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2009-02-08 23:25+0100\n"
+"POT-Creation-Date: 2009-02-15 22:43+0100\n"
 "PO-Revision-Date: 2008-12-24 19:16+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -320,6 +320,12 @@ msgstr "Canali Infosat"
 msgid "used"
 msgstr "uso"
 
+msgid "Button$Reset"
+msgstr ""
+
+msgid "Button$Copy"
+msgstr ""
+
 msgid "Days in advance"
 msgstr ""
 
@@ -338,5 +344,11 @@ msgstr ""
 msgid "Append non existing events"
 msgstr ""
 
+msgid "Reset all channel settings?"
+msgstr ""
+
+msgid "Copy settings to all channels?"
+msgstr ""
+
 msgid "Read EPG info from infosat"
 msgstr "Legge info EPG da Infosat"
diff --git a/process.cpp b/process.cpp
index 1eda3db..62bbcc3 100644
--- a/process.cpp
+++ b/process.cpp
@@ -1058,7 +1058,8 @@ bool cProcessInfosatepg::ParseInfosatepg(FILE *f,time_t *firststarttime)
                             tm.tm_isdst=-1;
                             oldstart=mktime(&tm);
                             dsyslog("infosatepg: using '%s'",s);
-                            dsyslog("infosatepg: start on %02i.%02i.%04i %02i:%02i (%s)",tm.tm_mday,tm.tm_mon+1,tm.tm_year+1900,
+                            dsyslog("infosatepg: start on %02i.%02i.%04i %02i:%02i (%s)",
+                                    tm.tm_mday,tm.tm_mon+1,tm.tm_year+1900,
                                     tm.tm_hour,tm.tm_min,asctime(&tm));
                             ignore=false;
                             ieventnr=1;
@@ -1085,14 +1086,6 @@ bool cProcessInfosatepg::ParseInfosatepg(FILE *f,time_t *firststarttime)
                 if (!ievent) ievent = new cInfosatevent;
                 tm.tm_hour=shour;
                 tm.tm_min=sminute;
-                /*
-                                if (*firststarttime==-1)
-                                {
-                                    shour-=2;
-                                    if (shour<0) shour=24+shour;
-                                    *firststarttime=(shour*100)+sminute;
-                                }
-                */
                 tm.tm_isdst=-1;
                 time_t start=mktime(&tm);
                 if ((oldstart!=(time_t) -1) && (difftime(start,oldstart)<0))
diff --git a/setup.cpp b/setup.cpp
index 5452e68..f1e3d24 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -66,7 +66,6 @@ cMenuSetupInfosatepg::cMenuSetupInfosatepg (cGlobalInfosatepg *Global)
             Add (new cOsdItem (buffer));
         }
     }
-    //SetHelp(tr("Button$Reset"));
 }
 
 cOsdItem *cMenuSetupInfosatepg::NewTitle (const char *s)
@@ -128,9 +127,22 @@ eOSState cMenuSetupInfosatepg::Edit()
     {
         int chanIndex=Current()-chanCurrent;
         if (chanIndex<global->InfosatChannels())
-            return AddSubMenu (new cMenuSetupChannelMenu (global,chanIndex));
+        {
+            eOSState state=AddSubMenu (new cMenuSetupChannelMenu (global,chanIndex));
+            cChannel *chan = Channels.GetByChannelID (global->GetChannelID (chanIndex));
+            if (chan)
+            {
+                int chanuse=global->GetChannelUsage(chanIndex);
+                cString buffer = cString::sprintf ("%s:\t%s",chan->Name(),chanuse ? tr ("used") : "");
+                cOsdItem *osd=Get(Current());
+                osd->SetText(buffer);
+            }
+            return state;
+        }
         else
+        {
             return osUnknown;
+        }
     }
     else
         return osUnknown;
@@ -148,10 +160,6 @@ eOSState cMenuSetupInfosatepg::ProcessKey (eKeys Key)
         {
             switch (Key)
             {
-            case kRed:
-                //dsyslog("Red1 key pressed");
-                state=osContinue;
-                break;
 
             case kOk:
                 state=Edit();
@@ -180,10 +188,10 @@ cMenuSetupChannelMenu::cMenuSetupChannelMenu (cGlobalInfosatepg *Global, int Ind
     newDays=global->GetChannelDays(index);
     if (newDays<=0) newDays=1;
 
-    channel = Channels.GetByChannelID (global->GetChannelID (index));
+    cChannel *channel = Channels.GetByChannelID (global->GetChannelID (index));
     if (!channel) return;
 
-    //SetHelp(NULL,tr("Button$Default"));
+    SetHelp(tr("Button$Reset"),tr("Button$Copy"));
 
     cString buffer = cString::sprintf("---- %s ----", channel->Name());
     Add (new cOsdItem (buffer,osUnknown,false));
@@ -201,6 +209,7 @@ void cMenuSetupChannelMenu::Store (void)
 {
     bool bReprocess=false;
 
+    cChannel *channel = Channels.GetByChannelID (global->GetChannelID (index));
     if (!channel) return;
     cString ChannelID = channel->GetChannelID().ToString();
     cString name = cString::sprintf("Channel-%s",*ChannelID);
@@ -229,10 +238,28 @@ eOSState cMenuSetupChannelMenu::ProcessKey (eKeys Key)
             switch (Key)
             {
             case kRed:
-                state=osContinue;
+                if (Skins.Message(mtInfo,tr("Reset all channel settings?"))==kOk)
+                {
+                    newDays=1;
+                    newChannelUse=USE_NOTHING;
+                    int oldindex=index;
+                    for (index=0; index<global->InfosatChannels(); index++) Store();
+                    index=oldindex;
+                    state=osBack;
+                }
+                else
+                {
+                    state=osContinue;
+                }
                 break;
             case kGreen:
-                //dsyslog("Green1 key pressed");
+                if (Skins.Message(mtInfo,tr("Copy settings to all channels?"))==kOk)
+                {
+                    int oldindex=index;
+                    for (index=0; index<global->InfosatChannels(); index++) Store();
+                    index=oldindex;
+
+                }
                 state=osContinue;
                 break;
 
diff --git a/setup.h b/setup.h
index 22c35b5..93816b4 100644
--- a/setup.h
+++ b/setup.h
@@ -45,7 +45,6 @@ private:
   int newDays;
   int newChannelUse;
   int index;
-  cChannel *channel;
 protected:
   virtual void Store(void);
 public: