[Mediaportal-svn] SF.net SVN: mediaportal: [15370] trunk/mediaportal/WindowPlugins/ GUIVideoFiles

[<che...@us...>]

Revision: 15370
          http://mediaportal.svn.sourceforge.net/mediaportal/?rev=15370&view=rev
Author:   chef_koch
Date:     2007-07-30 06:27:36 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
fixed current view mode is focused when ViewMode-Dialog is shown
fixed current sort method is focused when SortMethod-Dialog is shown

Modified Paths:
--------------
    trunk/mediaportal/WindowPlugins/GUIVideoFiles/GUIVideoBaseWindow.cs
    trunk/mediaportal/WindowPlugins/GUIVideoFiles/VideoViewHandler.cs

Modified: trunk/mediaportal/WindowPlugins/GUIVideoFiles/GUIVideoBaseWindow.cs
===================================================================
--- trunk/mediaportal/WindowPlugins/GUIVideoFiles/GUIVideoBaseWindow.cs	2007-07-30 13:01:08 UTC (rev 15369)
+++ trunk/mediaportal/WindowPlugins/GUIVideoFiles/GUIVideoBaseWindow.cs	2007-07-30 13:27:36 UTC (rev 15370)
@@ -574,20 +574,29 @@
     protected void OnShowViews()
     {
       GUIDialogMenu dlg = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
-      if (dlg == null)
-        return;
+      if (dlg == null) return;
       dlg.Reset();
-      dlg.SetHeading(499); // menu
-      dlg.Add(GUILocalizeStrings.Get(134));//videos
+      dlg.SetHeading(499); // Views menu
+
+      dlg.AddLocalizedString(134); // Shares
       foreach (ViewDefinition view in handler.Views)
       {
-        dlg.Add(view.LocalizedName); //play
+        dlg.Add(view.LocalizedName);
       }
+
+      // set the focus to currently used view
+      if (this.GetID == (int)GUIWindow.Window.WINDOW_VIDEOS)
+        dlg.SelectedLabel = 0;
+      else if (this.GetID == (int)GUIWindow.Window.WINDOW_VIDEO_TITLE)
+        dlg.SelectedLabel = handler.CurrentViewIndex + 1;
+
+      // show dialog and wait for result
       dlg.DoModal(GetID);
-      if (dlg.SelectedLabel == -1)
-        return;
+      if (dlg.SelectedId == -1) return;
+
+      
       if (dlg.SelectedLabel == 0)
-      {
+      { // shares view is selected
         int nNewWindow = (int)GUIWindow.Window.WINDOW_VIDEOS;
         VideoState.StartWindow = nNewWindow;
         if (nNewWindow != GetID)
@@ -597,7 +606,7 @@
         }
       }
       else
-      {
+      { // a db view is selected
         ViewDefinition selectedView = (ViewDefinition)handler.Views[dlg.SelectedLabel - 1];
         handler.CurrentView = selectedView.Name;
         VideoState.View = selectedView.Name;
@@ -620,10 +629,9 @@
     protected void OnShowSortOptions()
     {
       GUIDialogMenu dlg = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
-      if (dlg == null)
-        return;
+      if (dlg == null) return;
       dlg.Reset();
-      dlg.SetHeading(495);
+      dlg.SetHeading(495); // Sort options
 
       dlg.AddLocalizedString(365); // name
       dlg.AddLocalizedString(104); // date
@@ -632,11 +640,13 @@
       dlg.AddLocalizedString(367); // rating
       dlg.AddLocalizedString(430); // label
 
+      // set the focus to currently used sort method
+      dlg.SelectedLabel = (int)CurrentSortMethod;
+
+      // show dialog and wait for result
       dlg.DoModal(GetID);
+      if (dlg.SelectedId == -1) return;
 
-      if (dlg.SelectedLabel == -1)
-        return;
-
       switch (dlg.SelectedId)
       {
         case 365:

Modified: trunk/mediaportal/WindowPlugins/GUIVideoFiles/VideoViewHandler.cs
===================================================================
--- trunk/mediaportal/WindowPlugins/GUIVideoFiles/VideoViewHandler.cs	2007-07-30 13:01:08 UTC (rev 15369)
+++ trunk/mediaportal/WindowPlugins/GUIVideoFiles/VideoViewHandler.cs	2007-07-30 13:27:36 UTC (rev 15370)
@@ -91,36 +91,40 @@
                 return currentView.LocalizedName;
             }
         }
-		public string CurrentView 
-		{
-			get 
-			{ 
-				if (currentView == null) 
-					return String.Empty;
-				return currentView.Name; 
-			}
-			set 
-			{
-                bool done = false;
-				foreach (ViewDefinition definition in views)
-				{
-					if (definition.Name == value) 
-					{
-						currentView=definition;
-						CurrentLevel=0;
-                        done = true;
-                        break;
-					}
-				}
-                if (!done)
-                {
-                    if (views.Count > 0)
-                    {
-                        currentView = (ViewDefinition)views[0];
-                    }
-                }
-			}
-		}
+    public string CurrentView
+    {
+      get
+      {
+        if (currentView == null)
+          return String.Empty;
+        return currentView.Name;
+      }
+      set
+      {
+        bool done = false;
+        foreach (ViewDefinition definition in views)
+        {
+          if (definition.Name == value)
+          {
+            currentView = definition;
+            CurrentLevel = 0;
+            done = true;
+            break;
+          }
+        }
+        if (!done)
+        {
+          if (views.Count > 0)
+          {
+            currentView = (ViewDefinition)views[0];
+          }
+        }
+      }
+    }
+    public int CurrentViewIndex
+    {
+      get { return views.IndexOf(currentView); }
+    }
     public string CurrentLevelWhere
     {
       get


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.