Improved OSD handling of collapse/back

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

5 files changed, 60 insertions, 47 deletions

diff --git a/muggle-plugin/Makefile b/muggle-plugin/Makefile
index ad5a8df..fcad314 100644
--- a/muggle-plugin/Makefile
+++ b/muggle-plugin/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile,v 1.3 2004/02/01 22:35:22 RaK Exp $
+# $Id: Makefile,v 1.4 2004/02/03 00:13:24 LarsAC Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -40,7 +40,7 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I/usr/include/mysql/
+INCLUDES += -I$(VDRDIR) -I$(DVBDIR)/include -I/usr/include/mysql/
 
 DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
diff --git a/muggle-plugin/gd_content_interface.c b/muggle-plugin/gd_content_interface.c
index 7b7d15e..2727f4d 100644
--- a/muggle-plugin/gd_content_interface.c
+++ b/muggle-plugin/gd_content_interface.c
@@ -3,10 +3,10 @@
  * \brief  Data Objects for content (e.g. mp3 files, movies)
  * for the vdr muggle plugindatabase
  ******************************************************************** 
- * \version $Revision: 1.6 $
- * \date    $Date: 2004/02/02 22:48:04 $
+ * \version $Revision: 1.7 $
+ * \date    $Date: 2004/02/03 00:13:24 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
- * \author  file owner: $Author: MountainMan $
+ * \author  file owner: $Author: LarsAC $
  *
  * DUMMY
  * Implements main classes of for content items and interfaces to SQL databases
@@ -40,7 +40,7 @@ int GdInitDatabase(MYSQL *db)
     }
     
     if(mysql_real_connect(db,"localhost","root","",
-			  "GiantDisc",0,NULL,0) == NULL)
+			  "GiantDisc2",0,NULL,0) == NULL)
     {
 	return -2;
     }
@@ -1199,6 +1199,9 @@ mgContentItem* GdTreeNode::getSingleTrack()
 
 /* -------------------- begin CVS log ---------------------------------
  * $Log: gd_content_interface.c,v $
+ * Revision 1.7  2004/02/03 00:13:24  LarsAC
+ * Improved OSD handling of collapse/back
+ *
  * Revision 1.6  2004/02/02 22:48:04  MountainMan
  *  added CVS $Log
  *
diff --git a/muggle-plugin/muggle.h b/muggle-plugin/muggle.h
index 6fbe44d..e2e9bba 100644
--- a/muggle-plugin/muggle.h
+++ b/muggle-plugin/muggle.h
@@ -2,10 +2,10 @@
 /*! \file   muggle.h
  *  \brief  Implements a plugin for browsing media libraries within VDR
  ******************************************************************** 
- * \version $Revision: 1.2 $
- * \date    $Date: 2004/02/01 22:12:56 $
+ * \version $Revision: 1.3 $
+ * \date    $Date: 2004/02/03 00:13:24 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
- * \author  file owner: $Author: RaK $
+ * \author  file owner: $Author: LarsAC $
  */
 /*******************************************************************/
 
@@ -17,7 +17,7 @@
 #ifdef SHELL_TEST
   #include "shell_plugin.h"
 #else
-  #include <vdr/plugin.h>
+  #include <plugin.h>
 #endif
 
 class mgMuggle : public cPlugin
diff --git a/muggle-plugin/vdr_menu.c b/muggle-plugin/vdr_menu.c
index 1aff6a7..cdce65b 100644
--- a/muggle-plugin/vdr_menu.c
+++ b/muggle-plugin/vdr_menu.c
@@ -2,29 +2,17 @@
 /*! \file   vdr_menu.c
  *  \brief  Implements menu handling for broswing media libraries within VDR
  ******************************************************************** 
- * \version $Revision: 1.5 $
- * \date    $Date: 2004/02/02 23:33:41 $
+ * \version $Revision: 1.6 $
+ * \date    $Date: 2004/02/03 00:13:24 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
- * \author  file owner: $Author: MountainMan $
- *
- * $Log: vdr_menu.c,v $
- * Revision 1.5  2004/02/02 23:33:41  MountainMan
- * impementation of gdTrackFilters
- *
- * Revision 1.4  2004/02/02 22:33:24  MountainMan
- *  changes in mgFilter classes (and ttheir use in the osd)
- *
- * Revision 1.3  2004/02/02 19:42:37  LarsAC
- * Added positioning of menubar when collapsing nodes.
- *
- * Revision 1.2  2004/02/02 19:17:44  LarsAC
- * Added generic filter handling to OSD
+ * \author  file owner: $Author: LarsAC $
  *
+ * $Id: vdr_menu.c,v 1.6 2004/02/03 00:13:24 LarsAC Exp $
  */
 /*******************************************************************/
 
-#include <vdr/menuitems.h>
-#include <vdr/tools.h>
+#include <menuitems.h>
+#include <tools.h>
 #include <mysql/mysql.h>
 
 #include "vdr_menu.h"
@@ -40,8 +28,6 @@
 
 using namespace std;
 
-// static const char* alpha_num_keys = "abcdefghijklmnopqrstuvwxyz0123456789-";
-
 // ----------------------- mgMenuTreeItem ------------------
 
 mgMenuTreeItem::mgMenuTreeItem( mgSelectionTreeNode *node )
@@ -221,6 +207,7 @@ eOSState mgMainMenu::ProcessKey(eKeys key)
 	    {
 	      // OK: Create filter and selection tree and display
 	      mgDebug( 1,  "mgMainMenu: create and apply filter" );
+	      // m_media->applyFilters();
 	    } break;
 	  case kRed: // ???
 	  case kYellow:
@@ -249,6 +236,10 @@ eOSState mgMainMenu::ProcessKey(eKeys key)
 	    }
 	  }
       }
+    else if( state == osBack )
+      {
+	// m_media->resetFilters();	
+      }
   }
   else if( m_state == TREE )
     {
@@ -264,6 +255,7 @@ eOSState mgMainMenu::ProcessKey(eKeys key)
 		mgDebug( 1,  "mgMainMenu: switch to filter" );
 
 		m_history.push_back( Current() );
+		mgDebug( 1, "Remember current node #%i", Current() );
 
 		mgSelectionTreeNode *child = CurrentNode();		
 		DisplayTree( child );
@@ -338,9 +330,17 @@ eOSState mgMainMenu::ProcessKey(eKeys key)
 	      DisplayTree( parent );
 
 	      // restore last selected entry
-	      cOsdItem *item = Get( m_history.back() );
+	      int last = m_history.back();
+	      mgDebug( 1, "Setting current to #%d", last );
+
+	      cOsdItem *item = Get( last );
 	      m_history.pop_back();
 	      SetCurrent( item );
+
+	      RefreshCurrent();	      
+	      DisplayCurrent(true);
+	      
+	      Interface->Flush();
 	    }
 	  state = osContinue;
 	}
@@ -491,11 +491,6 @@ void mgMainMenu::DisplayTree( mgSelectionTreeNode* node )
 {
   m_state = TREE;
 
-  if( node == m_root )
-    {
-      m_history.clear();
-    }
-  
   if( node->expand( ) )
     {
       Clear();
@@ -565,8 +560,8 @@ void mgMainMenu::DisplayFilter()
 	  {
 	    mgFilterBool *fb = (mgFilterBool *) (*iter);
 	    Add( new cMenuEditBoolItem(  fb->getName(), &( fb->m_bval), 
-					fb->getTrueString().c_str(), 
-					fb->getFalseString().c_str() ) );
+					 fb->getTrueString().c_str(), 
+					 fb->getFalseString().c_str() ) );
 	  } break;
 	default:
 	case mgFilter::UNDEF:
@@ -582,3 +577,13 @@ void mgMainMenu::DisplayFilterSelector()
 {
 
 }
+
+/************************************************************
+ *
+ * $Log: vdr_menu.c,v $
+ * Revision 1.6  2004/02/03 00:13:24  LarsAC
+ * Improved OSD handling of collapse/back
+ *
+ *
+ ************************************************************
+ */
diff --git a/muggle-plugin/vdr_menu.h b/muggle-plugin/vdr_menu.h
index 36e3bb3..4c84631 100644
--- a/muggle-plugin/vdr_menu.h
+++ b/muggle-plugin/vdr_menu.h
@@ -2,17 +2,12 @@
 /*! \file   vdr_menu.h
  *  \brief  Implements menu handling for broswing media libraries within VDR
  ******************************************************************** 
- * \version $Revision: 1.4 $
- * \date    $Date: 2004/02/02 19:42:37 $
+ * \version $Revision: 1.5 $
+ * \date    $Date: 2004/02/03 00:13:24 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
  * \author  file owner: $Author: LarsAC $
  *
- * $Log: vdr_menu.h,v $
- * Revision 1.4  2004/02/02 19:42:37  LarsAC
- * Added positioning of menubar when collapsing nodes.
- *
- * Revision 1.3  2004/02/02 19:17:44  LarsAC
- * Added generic filter handling to OSD
+ * $Id: vdr_menu.h,v 1.5 2004/02/03 00:13:24 LarsAC Exp $
  *
  */
 /*******************************************************************/
@@ -26,7 +21,7 @@
   #include "myosd.h"
   #include "mymenuitems.h"
 #else
-  #include <vdr/osd.h>
+  #include <osd.h>
 #endif
 
 #include <list>
@@ -105,3 +100,13 @@ class mgMainMenu : public cOsdMenu
 };
 
 #endif
+
+/************************************************************
+ *
+ * $Log: vdr_menu.h,v $
+ * Revision 1.5  2004/02/03 00:13:24  LarsAC
+ * Improved OSD handling of collapse/back
+ *
+ *
+ ************************************************************
+ */