- error in filter view while trying to switch or using the colour keys

  workaround: first filter criteria is inttype. than it works, dont ask why ;-(


git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@48 e10066b5-e1e2-0310-b819-94efdf66514b

2 files changed, 30 insertions, 25 deletions

diff --git a/gd_content_interface.c b/gd_content_interface.c
index 2ceedb5..ba5429a 100644
--- a/gd_content_interface.c
+++ b/gd_content_interface.c
@@ -3,8 +3,8 @@
  * \brief  Data Objects for content (e.g. mp3 files, movies)
  * for the vdr muggle plugindatabase
  ******************************************************************** 
- * \version $Revision: 1.20 $
- * \date    $Date: 2004/02/23 16:30:58 $
+ * \version $Revision: 1.21 $
+ * \date    $Date: 2004/02/23 17:03:24 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
  * \author  file owner: $Author: RaK $
  *
@@ -92,16 +92,16 @@ gdFilterSets::gdFilterSets()
   rating->push_back("+");
   rating->push_back("++");
  
+  // year-from
+  filter = new mgFilterInt(tr("year (from)"), 1901, 1900, 2100); set->push_back(filter);
+  // year-to
+  filter = new mgFilterInt(tr("year (to)"), 2099, 1900, 2100); set->push_back(filter);
   // title
   filter = new mgFilterString(tr("title"), ""); set->push_back(filter);
   // artist
   filter = new mgFilterString(tr("artist"), ""); set->push_back(filter);
   // genre
   filter = new mgFilterString(tr("genre"), ""); set->push_back(filter);
-  // year-from
-  filter = new mgFilterInt(tr("year (from)"), 1900); set->push_back(filter);
-  // year-to
-  filter = new mgFilterInt(tr("year (to)"), 2100); set->push_back(filter);
   // rating
   filter = new mgFilterChoice(tr("rating"), 1, rating); set->push_back(filter);
 
@@ -110,16 +110,16 @@ gdFilterSets::gdFilterSets()
   m_titles.push_back(tr("Album Search"));
   
   set = new vector<mgFilter*>();
+  // year-from
+  filter = new mgFilterInt(tr("year (from)"), 1901, 1900, 2100); set->push_back(filter);
+  // year-to
+  filter = new mgFilterInt(tr("year (to)"), 2099, 1900, 2100); set->push_back(filter);
   // title
   filter = new mgFilterString(tr("album title"), ""); set->push_back(filter);
   // artist
   filter = new mgFilterString(tr("album artist"), ""); set->push_back(filter);
   // genre
   filter = new mgFilterString(tr("genre"), ""); set->push_back(filter);
-  // year-from
-  filter = new mgFilterInt(tr("year (from)"), 1900); set->push_back(filter);
-  // year-to
-  filter = new mgFilterInt(tr("year (to)"), 2100); set->push_back(filter);
   // rating
   filter = new mgFilterChoice(tr("rating"), 1, rating); set->push_back(filter);
 
@@ -128,6 +128,10 @@ gdFilterSets::gdFilterSets()
   m_titles.push_back(tr("Playlist Search"));
   
   set = new vector<mgFilter*>();
+  // year-from
+  filter = new mgFilterInt(tr("year (from)"), 1901, 1900, 2100); set->push_back(filter);
+  // year-to
+  filter = new mgFilterInt(tr("year (to)"), 2099, 1900, 2100); set->push_back(filter);
   // title
   filter = new mgFilterString(tr("playlist title"), ""); set->push_back(filter);
   // artist
@@ -138,10 +142,6 @@ gdFilterSets::gdFilterSets()
   filter = new mgFilterString(tr("artist"), ""); set->push_back(filter);
   // genre
   filter = new mgFilterString(tr("genre"), ""); set->push_back(filter);
-  // year-from
-  filter = new mgFilterInt(tr("year (from)"), 1900); set->push_back(filter);
-  // year-to
-  filter = new mgFilterInt(tr("year (to)"), 2100); set->push_back(filter);
   // rating
   filter = new mgFilterChoice(tr("rating"), 1, rating); set->push_back(filter);
 
@@ -1391,6 +1391,10 @@ mgContentItem* GdTreeNode::getSingleTrack()
 
 /* -------------------- begin CVS log ---------------------------------
  * $Log: gd_content_interface.c,v $
+ * Revision 1.21  2004/02/23 17:03:24  RaK
+ * - error in filter view while trying to switch or using the colour keys
+ *   workaround: first filter criteria is inttype. than it works, dont ask why ;-(
+ *
  * Revision 1.20  2004/02/23 16:30:58  RaK
  * - album search error because of i18n corrected
  *
diff --git a/vdr_menu.c b/vdr_menu.c
index 815e533..8d4cf06 100644
--- a/vdr_menu.c
+++ b/vdr_menu.c
@@ -2,12 +2,12 @@
 /*! \file   vdr_menu.c
  *  \brief  Implements menu handling for browsing media libraries within VDR
  ******************************************************************** 
- * \version $Revision: 1.18 $
- * \date    $Date: 2004/02/23 16:18:15 $
+ * \version $Revision: 1.19 $
+ * \date    $Date: 2004/02/23 17:03:24 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
  * \author  file owner: $Author: RaK $
  *
- * $Id: vdr_menu.c,v 1.18 2004/02/23 16:18:15 RaK Exp $
+ * $Id: vdr_menu.c,v 1.19 2004/02/23 17:03:24 RaK Exp $
  */
 /*******************************************************************/
 
@@ -343,13 +343,6 @@ eOSState mgMainMenu::ProcessKey(eKeys key)
 	{
 	  switch( key )
 	    {
-	    case kOk:
-	      {
-		// OK: Create filter and selection tree and display
-		mgDebug( 1,  "mgMainMenu: create and apply filter" );
-		// m_media->applyFilters();
-		state = osContinue;
-	      } break;
 	    case kRed: // 
 	      {
 		mgDebug( 1,  "mgMainMenu: query and display results" );
@@ -387,7 +380,8 @@ eOSState mgMainMenu::ProcessKey(eKeys key)
 	    case kBlue:
 	      {
 		mgDebug( 1,  "mgMainMenu: submenu" );
-	      }
+		state = osContinue;			  
+	      } break;
 	    default:
 	      {
 		state = osContinue;
@@ -398,6 +392,9 @@ eOSState mgMainMenu::ProcessKey(eKeys key)
 	{
 	  // m_media->resetFilters();?
 	}
+    // RaK: Verhindert, dass die Help Buttons verschwinden, 
+    //      ist aber keine schöne Lösung
+    //SetHelp( tr("Query"), tr("Other Search"), tr("Browser"), tr("Submenu") );
     }
   else
     {
@@ -643,6 +640,10 @@ void mgMainMenu::DisplayFilterSelector()
 /************************************************************
  *
  * $Log: vdr_menu.c,v $
+ * Revision 1.19  2004/02/23 17:03:24  RaK
+ * - error in filter view while trying to switch or using the colour keys
+ *   workaround: first filter criteria is inttype. than it works, dont ask why ;-(
+ *
  * Revision 1.18  2004/02/23 16:18:15  RaK
  * - i18n
  *