5 files changed, 26 insertions, 13 deletions

diff --git a/README b/README
index b38cf6e..3047018 100644
--- a/README
+++ b/README
@@ -137,12 +137,27 @@ up/down, left/right and the ok key. In scrolling lists, with left/right
 jump to the next page of the list. Pressing up on the first / down on the 
 last list item jumpps to the end / start of the list.
 
-If the Option "Use folders for instant records" is set, both during creating an
-instant records and a series timer you can choose the directory where the
-recordings will be stored. As possible folders all entries from VDRs
-<VDRCONFIG>/folders.conf will be used. These entries can be edited via OSD
-through VDRs Timers Menu. These folders are also provided to choose a folder
-for a search timer.
+In the Plugin Setup Menu in Section "Recording Menus and Favorites" you can
+choose three alternatives for the option "Folder for instant Recordings":
+- "Always use root video folder": the recording will always be placed in the
+  video root folder
+- "Select from folder list": before creating a timer, you'll get asked in which
+  directory the recording should be placed. If the epgsearch plugin is not 
+  available, the entries from VDRs <VDRCONFIG>/folders.conf will be used. If
+  the epgsearch plugin is available, the more sophisticated epgsearch mechanism
+  will be used to identify the possible folders (folders from 
+  <VDRCONFIG>/folders.conf and epgsearchfolders.conf and all already existing 
+  folders in the video directory).
+- "Use fixed folder": the configured folder will always be used. If this string
+  is a epgsearch variable ("%variable%"), epgsearch will be used to replace 
+  the variable with a concrete folder. All values defined in the epgsearch config
+  file "epgsearchuservars.conf" can be used. These variables use the definitions
+  from "epgsearchcats.conf". For a detailed description see the epgsearch Manual.
+  With that and a with an EPG with detailed information about movies and series 
+  it is possible to create sophisticated paths for timers automatically (for 
+  instance with series season and episode in the filename).   
+
+For a search timer also all folders and the defined dedicated folder can be used.
 
 Favorites Menu: if configured, the blue key provides a favorite menu. In this
 menu the current scheduling ("What's on now") and the next upcomming Shows 
@@ -234,8 +249,10 @@ Setup Options
 
 * Recording Menus and Favorites
 
-- Use folders for instant records. If set to yes, when creating an instant record
-  or a series timer you'll be asked about the folder for the recordings.
+- Folder for instant Recordings: (see chapter "Usage" for detailed description)
+  - Always use root video folder
+  - Select from folder list
+  - Use fixed folder
 - Use Remotetimers: Timers are handled not locally but on a VDR Server defined
   with the remotetimers plugin.
 - Use "What's on now" in favorites
diff --git a/config.c b/config.c
index 56db8bd..054b9be 100644
--- a/config.c
+++ b/config.c
@@ -44,7 +44,6 @@ cTvguideConfig::cTvguideConfig() {
     numAdditionalEPGPictures = 9;

     epgImageWidthLarge = 525;

     epgImageHeightLarge = 400;

-    recMenuAskFolder = 0;

     instRecFolderMode = eFolderRoot;

     instRecFixedFolder = "";

     favWhatsOnNow = 1;

@@ -279,7 +278,6 @@ bool cTvguideConfig::SetupParse(const char *Name, const char *Value) {
     else if (strcmp(Name, "channelHeaderWidthPercent") == 0)  channelHeaderWidthPercent = atoi(Value);

     else if (strcmp(Name, "channelHeaderHeightPercent") == 0) channelHeaderHeightPercent = atoi(Value);

     else if (strcmp(Name, "footerHeightPercent") == 0)      footerHeightPercent = atoi(Value);

-    else if (strcmp(Name, "recMenuAskFolder") == 0)         recMenuAskFolder = atoi(Value);

     else if (strcmp(Name, "instRecFolderMode") == 0)        instRecFolderMode = atoi(Value);

     else if (strcmp(Name, "instRecFixedFolder") == 0)       instRecFixedFolder = Value;

     else if (strcmp(Name, "favWhatsOnNow") == 0)            favWhatsOnNow = atoi(Value);

diff --git a/config.h b/config.h
index 6b96244..6535ae9 100644
--- a/config.h
+++ b/config.h
@@ -98,7 +98,6 @@ class cTvguideConfig {
         cString logoPathDefault;

         cString iconPathDefault;

         cString epgImagePathDefault;

-        int recMenuAskFolder;

         int instRecFolderMode;

         std::string instRecFixedFolder;

         int favWhatsOnNow;

diff --git a/setup.c b/setup.c
index 0ecb205..8e58fac 100644
--- a/setup.c
+++ b/setup.c
@@ -101,7 +101,6 @@ void cTvguideSetup::Store(void) {
     SetupStore("channelHeaderWidthPercent", tvguideConfig.channelHeaderWidthPercent);
     SetupStore("channelHeaderHeightPercent", tvguideConfig.channelHeaderHeightPercent);
     SetupStore("footerHeightPercent", tvguideConfig.footerHeightPercent);
-    SetupStore("recMenuAskFolder", tvguideConfig.recMenuAskFolder);
     SetupStore("instRecFolderMode", tvguideConfig.instRecFolderMode);
     SetupStore("instRecFixedFolder", tvguideConfig.instRecFixedFolder.c_str());
     SetupStore("favWhatsOnNow", tvguideConfig.favWhatsOnNow);
diff --git a/tvguide.c b/tvguide.c
index 29eb42c..9f7d9d8 100644
--- a/tvguide.c
+++ b/tvguide.c
@@ -26,7 +26,7 @@
 #error "VDR-2.0.0 API version or greater is required!"
 #endif
 
-static const char *VERSION        = "1.2.0";
+static const char *VERSION        = "1.2.1pre";
 static const char *DESCRIPTION    = "A fancy 2d EPG Viewer";
 static const char *MAINMENUENTRY  = "Tvguide";