Thread: [Mp-plugins-svn] SF.net SVN: mp-plugins: [555] trunk/plugins/MyFilms (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 555
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=555&view=rev
Author:   zebons
Date:     2007-06-15 15:21:16 -0700 (Fri, 15 Jun 2007)

Log Message:
-----------
Corrected bug for hierarchy structure

Modified Paths:
--------------
    trunk/plugins/MyFilms/MesFilms.cs
    trunk/plugins/MyFilms/MesFilmsDetail.cs
    trunk/plugins/MyFilms/MesFilmsSetup.cs

Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================

--- trunk/plugins/MyFilms/MesFilms.cs	2007-06-15 00:25:15 UTC (rev 554)
+++ trunk/plugins/MyFilms/MesFilms.cs	2007-06-15 22:21:16 UTC (rev 555)
@@ -149,6 +149,7 @@
         string CurrentSortMethod = null;
         decimal w_rating = 0;
         int l_index = 0;
+        string l_title = "";
         string FileImage = "9999";
         AntMovieCatalog mydivx =new AntMovieCatalog();
         private string StrPluginName = "Films";
@@ -560,7 +561,7 @@
                             // New Window for detailed selected item information
                             {
                                 //l_index = facadeView.SelectedListItemIndex;
-                                save_config_values();
+                                //save_config_values();
                                 mydivx.Clear();
                                 GUIWindowManager.ActivateWindow(ID_MesFilmsDetail);
                             }
@@ -784,7 +785,14 @@
 	            }
                 if (iSelItem >= 0) //-1 = ignore, >=0 = itemID to locate (test every item in case item is from within a folder)
                 {
-                    if ((int)(r["Number"]) == iSelItem) l_index = facadeView.Count - 1; //test if this item is one to select
+                    if (!(l_title.Length > 0))
+                    {
+                        if (((int)(r["Number"]) == iSelItem)) l_index = facadeView.Count - 1; //test if this item is one to select
+                    }
+                    else
+                    {
+                        if (((int)(r["Number"]) == iSelItem) && ((string)(r[StrTitle1]) == l_title)) l_index = facadeView.Count - 1; //test if this item is one to select
+                    }
                 }
                 sPrevTitle = sTitle;
             fin: ;
@@ -795,6 +803,8 @@
 
             GUIControl.SelectItemControl(GetID, (int)Controls.CTRL_List, (int)l_index);
 	        GUIPropertyManager.SetProperty("#nbobjects", facadeView.Count.ToString() + " " + GUILocalizeStrings.Get(127));
+            if (facadeView.Count == 1 && item.IsFolder)
+                wselectedlabel = item.Label;
             return !(facadeView.Count == 1 && item.IsFolder); //ret false if single folder found
 		}
 
@@ -1204,6 +1214,7 @@
                 xmlwriter.SetValue(CurrentConfig, "StrSortSens", StrSortSens.ToString());
                 xmlwriter.SetValue(CurrentConfig, "Selection", StrTxtSelect);
                 xmlwriter.SetValue(CurrentConfig, "IndexItem", (facadeView.SelectedListItemIndex > -1) ? ((boolselect) ? facadeView.SelectedListItemIndex.ToString() : facadeView.SelectedListItem.ItemId.ToString()) : "-1"); //may need to check if there is no item selected and so save -1
+                xmlwriter.SetValue(CurrentConfig, "TitleItem", (facadeView.SelectedListItemIndex > -1) ? ((boolselect) ? facadeView.SelectedListItemIndex.ToString() : facadeView.SelectedListItem.Label.ToString()) : ""); //may need to check if there is no item selected and so save ""
                 xmlwriter.SetValueAsBool(CurrentConfig, "boolselect", boolselect);
                 xmlwriter.SetValueAsBool(CurrentConfig, "boolreturn", boolreturn);
                 xmlwriter.SetValue(CurrentConfig, "WSelectedLabel", wselectedlabel);
@@ -1286,6 +1297,7 @@
                 StrSortSens = xmlreader.GetValueAsString(CurrentConfig, "StrSortSens", "");
                 StrTxtSelect = xmlreader.GetValueAsString(CurrentConfig, "Selection", "");
                 l_index = xmlreader.GetValueAsInt(CurrentConfig, "IndexItem", -1);
+                l_title = xmlreader.GetValueAsString(CurrentConfig, "TitleItem", "");
                 boolselect = xmlreader.GetValueAsBool(CurrentConfig, "boolselect", false);
                 boolreturn = xmlreader.GetValueAsBool(CurrentConfig, "boolreturn", false);
                 WStrSort = xmlreader.GetValueAsString(CurrentConfig, "WStrSort", "");

Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs	2007-06-15 00:25:15 UTC (rev 554)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs	2007-06-15 22:21:16 UTC (rev 555)
@@ -103,6 +103,7 @@
         bool SearchFile = false;
         string CurrentConfig = null;
         string wzone = null;
+        string StrTIndex = null;
         int StrIndex = 0;
         int StrMax = 0;
         public SQLiteClient m_db;
@@ -198,7 +199,8 @@
                         StrSort = xmlreader.GetValueAsString(CurrentConfig, "StrSort", "");
                         CurrentSortMethod = xmlreader.GetValueAsString(CurrentConfig, "CurrentSortMethod", "");
                         StrSortSens = xmlreader.GetValueAsString(CurrentConfig, "StrSortSens", "");
-                        StrIndex = (int)xmlreader.GetValueAsInt(CurrentConfig, "IndexItem", 0);
+                        StrIndex = xmlreader.GetValueAsInt(CurrentConfig, "IndexItem", 0);
+                        StrTIndex = xmlreader.GetValueAsString(CurrentConfig, "TitleItem", "");
                         Strlabel1 = xmlreader.GetValueAsString(CurrentConfig, "AntLabel1", "");
                         Strlabel2 = xmlreader.GetValueAsString(CurrentConfig, "AntLabel2", "");
                         Stritem1 = xmlreader.GetValueAsString(CurrentConfig, "AntItem1", "");
@@ -556,12 +558,25 @@
                 StrIndex = -1;
                 foreach (DataRow enr in r)
                 {
-                    if ((int)(enr["Number"]) == ItemId)
+                    if ((StrTIndex != "") && (StrTIndex != null))
                     {
-                        StrIndex = cnt;
-                        break;
+                        string wtitle = enr[StrTitle1].ToString();
+                        if (((int)(enr["Number"]) == ItemId) && (StrTIndex.Substring(StrTIndex.LastIndexOf(TitleDelim) + 1) == StrTIndex.Substring(StrTIndex.LastIndexOf(TitleDelim) + 1)))
+                        {
+                            StrIndex = cnt;
+                            break;
+                        }
+                        cnt++;
                     }
-                    cnt++;
+                    else
+                    {
+                        if ((int)(enr["Number"]) == ItemId)
+                        {
+                            StrIndex = cnt;
+                            break;
+                        }
+                        cnt++;
+                    }
                 }
             }
         }
@@ -776,6 +791,7 @@
         using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
         {
             xmlwriter.SetValue(CurrentConfig, "IndexItem", r[StrIndex]["Number"]);
+            xmlwriter.SetValue(CurrentConfig, "TitleItem", r[StrIndex][StrTitle1]);
             if (ID != -1) xmlwriter.SetValue(CurrentConfig, "LastID", ID);
         }
     }

Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsSetup.cs	2007-06-15 00:25:15 UTC (rev 554)
+++ trunk/plugins/MyFilms/MesFilmsSetup.cs	2007-06-15 22:21:16 UTC (rev 555)
@@ -319,6 +319,8 @@
                     StrDfltSelect = "(" + StrDfltSelect + "(" + AntFilterItem2.Text + " " + wAntFilterSign + " #" + Convert.ToDateTime(AntFilterText2.Text) + "# or " + AntFilterItem2.Text + " is null)) AND ";
                 else
                     StrDfltSelect = "(" + StrDfltSelect + "(" + AntFilterItem2.Text + " " + wAntFilterSign + " '" + AntFilterText2.Text + "' or " + AntFilterItem2.Text + " is null)) AND ";
+            if (View_Dflt_Item.Text.Length == 0)
+                View_Dflt_Item.Text = "(none)";
             Verify_Config();
             //string currentLanguage = String.Empty;
             //using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))


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




Thread: [Mp-plugins-svn] SF.net SVN: mp-plugins: [555] trunk/plugins/MyFilms (Page 2)

mp-plugins-svn