Thread: [Mp-plugins-svn] SF.net SVN: mp-plugins: [870] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt (Page 3)

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

Revision: 870
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=870&view=rev
Author:   northern_sky
Date:     2007-08-27 03:30:17 -0700 (Mon, 27 Aug 2007)

Log Message:
-----------
more cleanups

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj

Removed Paths:
-------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltUserSettings.cs

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
===================================================================

--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs	2007-08-27 05:44:33 UTC (rev 869)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs	2007-08-27 10:30:17 UTC (rev 870)
@@ -61,25 +61,20 @@
   {
 
     #region Variables
-
-
+    
     bool currentSortAsc = true;
-    // FacadeView
-    const int facadeIDConst = 50;
     ProgramViewHandler viewHandler = ProgramViewHandler.Instance;
     List<ApplicationItem> globalApplicationList;// dbHandlerInstance.ApplicationItemList;
     DirectoryHistory itemHistory = new DirectoryHistory();
     int slideSpeed = 3000; // speed in milliseconds between two slides
     long slideTime = 0;
-    bool skipInit = false;
     static string _thumbnailPath = string.Empty;
     static string _lastThumbnailPath = string.Empty;
 
     ProgramSort.SortMethod currentSortMethod = ProgramSort.SortMethod.Title;
     DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
 
-    GUIProgramsAltUserSettings userSettings = new GUIProgramsAltUserSettings();
-    ApplicationItem lastApp = null;
+     ApplicationItem currentApplicationItem = null;
     string prevFilepath = "";
     int selectedItemIndex = -1;
     Layout currentLayout = Layout.List;
@@ -97,125 +92,19 @@
     [SkinControl(6)]
     protected GUIImage screenShotImage = null;
 
-    [SkinControl(facadeIDConst)]
+    [SkinControl(50)]
     protected GUIFacadeControl facadeView = null;
 
    
 
     #endregion Variables
 
-    void SaveSettings()
-    {
-      using (Settings xmlwriter = new Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
-      {
-        switch ((Layout)userSettings.ViewLayout)
-        {
-          case Layout.List:
-            xmlwriter.SetValue("myprograms", "viewLayout", "list");
-            break;
-          case Layout.Icons:
-            xmlwriter.SetValue("myprograms", "viewLayout", "icons");
-            break;
-          case Layout.LargeIcons:
-            xmlwriter.SetValue("myprograms", "viewLayout", "largeicons");
-            break;
-          case Layout.FilmStrip:
-            xmlwriter.SetValue("myprograms", "viewLayout", "filmstrip");
-            break;
-        }
-        xmlwriter.SetValue("myprograms", "lastAppID", userSettings.LastAppID.ToString());
-        //        xmlwriter.SetValue("myprograms", "lastViewLevel", userSettings.LastViewLevel.ToString());
-        xmlwriter.SetValue("myprograms", "lastViewLevel", ViewHandler.CurrentLevel);
-        xmlwriter.SetValue("myprograms", "sortMethod", userSettings.SortMethod);
-        // avoid bool conversion...... don't wanna know why it doesn't work! :-(
-        if (userSettings.SortAscending)
-        {
-          xmlwriter.SetValue("myprograms", "sortASC", "yes");
-        }
-        else
-        {
-          xmlwriter.SetValue("myprograms", "sortASC", "no");
-        }
-
-        if (userSettings.OverviewVisible)
-        {
-          xmlwriter.SetValue("myprograms", "overviewvisible", "yes");
-        }
-        else
-        {
-          xmlwriter.SetValue("myprograms", "overviewvisible", "no");
-        }
-
-        xmlwriter.SetValue("myprograms", "startview", (int)userSettings.ViewLayout);
-      }
-    }
-
-    void LoadSettings()
-    {
-      slideSpeed = ProgramUtils.GetSleepTime();
-
-      using (Settings xmlreader = new Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
-      {
-        string curText = "";
-        curText = xmlreader.GetValueAsString("myprograms", "viewLayout", "list");
-
-        if (curText == "list") userSettings.ViewLayout = (int)Layout.List;
-        else if (curText == "icons") userSettings.ViewLayout = (int)Layout.Icons;
-        else if (curText == "largeicons") userSettings.ViewLayout = (int)Layout.LargeIcons;
-        else if (curText == "filmstrip") userSettings.ViewLayout = (int)Layout.FilmStrip;
-        else userSettings.ViewLayout = (int)Layout.List;
-
-        CurrentSortMethod = (ProgramSort.SortMethod)xmlreader.GetValueAsInt("myprograms", "sortMethod", (int)ProgramSort.SortMethod.Title);
-
-        userSettings.LastAppID = xmlreader.GetValueAsInt("myprograms", "lastAppID", -1);
-        userSettings.LastViewLevel = xmlreader.GetValueAsInt("myprograms", "lastViewLevel", -1);
-        userSettings.SortAscending = xmlreader.GetValueAsBool("myprograms", "sortASC", true);
-        userSettings.OverviewVisible = xmlreader.GetValueAsBool("myprograms", "sortASC", true);
-      }
-    }
-
-    void LoadLastAppIDFromSettings()
-    {
-      using (Settings xmlreader = new Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
-      {
-        userSettings.LastAppID = xmlreader.GetValueAsInt("myprograms", "lastAppID", -1);
-        userSettings.LastViewLevel = xmlreader.GetValueAsInt("myprograms", "lastViewLevel", -1);
-        userSettings.SortMethod = xmlreader.GetValueAsInt("myprograms", "sortMethod", 0);
-        userSettings.SortAscending = xmlreader.GetValueAsBool("myprograms", "sortAsc", true);
-        userSettings.OverviewVisible = xmlreader.GetValueAsBool("myprograms", "overviewvisible", true);
-      }
-    }
-
-    void LoadFolderSettings(string directoryName)
-    {
-      if (directoryName == "")
-        directoryName = "root";
-
-      object o;
-      FolderSettings.GetFolderSetting(directoryName, "Programs", typeof(GUIProgramsAltUserSettings), out o);
-      if (o != null)
-        userSettings = o as GUIProgramsAltUserSettings;
-      if (userSettings == null)
-        userSettings = new GUIProgramsAltUserSettings();
-    }
-
-    void SaveFolderSettings(string directoryName)
-    {
-      if (directoryName == "")
-        directoryName = "root";
-      FolderSettings.AddFolderSetting(directoryName, "Programs", typeof(GUIProgramsAltUserSettings), userSettings);
-    }
-
     #region Constructor / Destructor
 
     public GUIProgramsAlt()
     {
-      
-     GetID = (int)Window.WINDOW_FILES;
+      GetID = (int)Window.WINDOW_FILES;
     }
-
- 
-
     #endregion Constructor / Destructor
 
     #region Properties / Helper Routines
@@ -271,9 +160,9 @@
 
     int GetCurrentFatherID()
     {
-      if (lastApp != null)
+      if (currentApplicationItem != null)
       {
-        return lastApp.ApplicationItemId;
+        return currentApplicationItem.ApplicationItemId;
       }
       else
       {
@@ -284,27 +173,66 @@
 
     bool ThereAreAppsToDisplay()
     {
-      if (lastApp == null)
+      if (currentApplicationItem == null)
       {
         return true; // root has globalApplicationList
       }
       else
       {
-        return lastApp.SubItemsAllowed(); // grouper items for example
+        return currentApplicationItem.SubItemsAllowed(); // grouper items for example
       }
     }
 
-    bool ThereAreFilesOrLinksToDisplay()
+    bool IsCurrentApplicationItemNull()
     {
-      return (lastApp != null); // all globalApplicationList can have files except the root
+      return (currentApplicationItem != null); // all globalApplicationList can have files except the root
     }
 
-    bool IsBackButtonNecessary()
+    #endregion
+
+    string GetViewLayoutAsText()
     {
-      return (lastApp != null); // always show back button except for root
+      string result;
+
+      switch (CurrentLayout)
+      {
+        case Layout.List:
+          result = GUILocalizeStrings.Get(101);
+          break;
+        case Layout.Icons:
+          result = GUILocalizeStrings.Get(100);
+          break;
+        case Layout.LargeIcons:
+          result = GUILocalizeStrings.Get(417);
+          break;
+        case Layout.FilmStrip:
+          result = GUILocalizeStrings.Get(733);
+          break;
+        default:
+          result = "";
+          break;
+      }
+      return result;
     }
 
-    #endregion
+    public void SwitchToNextViewLayout()
+    {
+      switch (CurrentLayout)
+      {
+        case Layout.List:
+          CurrentLayout = Layout.Icons;
+          break;
+        case Layout.Icons:
+          CurrentLayout = Layout.LargeIcons;
+          break;
+        case Layout.LargeIcons:
+          CurrentLayout = Layout.FilmStrip;
+          break;
+        case Layout.FilmStrip:
+          CurrentLayout = Layout.List;
+          break;
+      }
+    }
 
     #region Private Methods
 
@@ -313,9 +241,55 @@
       dbHandlerInstance.LoadAllApplicationItems();
       globalApplicationList = dbHandlerInstance.ApplicationItemList;
       LoadSettings();
-      skipInit = true;
     }
 
+    void SaveSettings()
+    {
+      using (Settings xmlwriter = new Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+      {
+        if (currentApplicationItem != null)
+        {
+          xmlwriter.SetValue("myProgramsAlt", "applicationItemId", currentApplicationItem.ApplicationItemId);
+        }
+        xmlwriter.SetValue("myProgramsAlt", "lastViewLevel", ViewHandler.CurrentLevel);
+        xmlwriter.SetValue("myProgramsAlt", "sortMethod", (int)CurrentSortMethod);
+        xmlwriter.SetValue("myProgramsAlt", "view", ViewHandler.CurrentView);
+
+        // avoid bool conversion...... don't wanna know why it doesn't work! :-(
+        if (CurrentSortAsc)
+        {
+          xmlwriter.SetValue("myProgramsAlt", "sortASC", "yes");
+        }
+        else
+        {
+          xmlwriter.SetValue("myProgramsAlt", "sortASC", "no");
+        }
+        xmlwriter.SetValue("myProgramsAlt", "viewLayout", (int)CurrentLayout);
+      }
+    }
+
+    void LoadSettings()
+    {
+      slideSpeed = ProgramUtils.GetSleepTime();
+
+      using (Settings xmlreader = new Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+      {
+        CurrentSortMethod = (ProgramSort.SortMethod)xmlreader.GetValueAsInt("myProgramsAlt", "sortMethod", (int)ProgramSort.SortMethod.Title);
+        CurrentLayout = (Layout)xmlreader.GetValueAsInt("myProgramsAlt", "viewLayout", (int)Layout.List);
+
+        if (currentApplicationItem == null)
+        {//create a fake tmpappitem so it's not null
+         currentApplicationItem = new ApplicationItemGrouper();
+        }
+        currentApplicationItem.ApplicationItemId = xmlreader.GetValueAsInt("myProgramsAlt", "applicationItemId", -1);
+        
+        ViewHandler.CurrentLevel = xmlreader.GetValueAsInt("myProgramsAlt", "lastViewLevel", -1);
+        CurrentSortAsc = xmlreader.GetValueAsBool("myProgramsAlt", "sortASC", true);
+        ViewHandler.CurrentView = xmlreader.GetValueAsString("myProgramsAlt", "view", "");
+      }
+    }
+
+
     void SortChanged(object sender, SortEventArgs args)
     {
       this.CurrentSortAsc = args.Order != System.Windows.Forms.SortOrder.Descending;
@@ -329,13 +303,13 @@
 
       GUIPropertyManager.SetProperty("#view", ViewHandler.LocalizedCurrentView);
 
-      if (lastApp == null)
+      if (currentApplicationItem == null)
       {
         btnRefresh.IsVisible = false;
       }
       else
       {
-        btnRefresh.IsVisible = lastApp.RefreshGUIAllowed;
+        btnRefresh.IsVisible = currentApplicationItem.RefreshGUIAllowed;
       }
 
       facadeView.IsVisible = true;
@@ -343,7 +317,7 @@
       GUIControl.FocusControl(GetID, facadeView.GetID);
 
       // display apptitle if available.....
-      if (lastApp != null)
+      if (currentApplicationItem != null)
       {
         if ((ViewHandler.CurrentView != null) && (ViewHandler.MaxLevels > 0))
         {
@@ -351,7 +325,7 @@
         }
         else
         {
-          GUIPropertyManager.SetProperty("#curheader", lastApp.Title);
+          GUIPropertyManager.SetProperty("#curheader", currentApplicationItem.Title);
         }
       }
       else
@@ -367,7 +341,7 @@
         }
       }
 
-      btnViewAs.Label = userSettings.ViewLayoutTextName;
+      btnViewAs.Label = GetViewLayoutAsText();
 
       switch (CurrentSortMethod)
       {
@@ -402,7 +376,7 @@
     {
       int itemIndex = facadeView.SelectedListItemIndex;
 
-      switch ((Layout)userSettings.ViewLayout)
+      switch (CurrentLayout)
       {
         case Layout.List:
           facadeView.View = GUIFacadeControl.ViewMode.List;
@@ -439,7 +413,7 @@
 
     void RefreshThumbnail()
     {
-      ApplicationItem appWithImg = lastApp;
+      ApplicationItem appWithImg = currentApplicationItem;
       GUIListItem item = GetSelectedItem();
 
       // some preconditions...
@@ -467,16 +441,16 @@
     void UpdateListControl()
     {
       GUIControl.ClearControl(GetID, facadeView.GetID);
-      if (IsBackButtonNecessary())
+      if (IsCurrentApplicationItemNull())
         ProgramUtils.AddBackButton(facadeView);
 
       int TotalItems = 0;
       if (ThereAreAppsToDisplay())
         TotalItems += DisplayApps();
-      if (ThereAreFilesOrLinksToDisplay())
+      if (IsCurrentApplicationItemNull())
         TotalItems += DisplayFiles();
 
-      if (lastApp != null)
+      if (currentApplicationItem != null)
         facadeView.Sort(new ProgramSort(CurrentSortMethod, CurrentSortAsc));
 
       //set object count label
@@ -491,16 +465,16 @@
 
     int DisplayFiles()
     {
-      if (lastApp == null) return 0;
+      if (currentApplicationItem == null) return 0;
 
       // Refresh FileList if view has changed, while this appItem was not active
-      if ((lastApp.CurrentView != ViewHandler.CurrentView) || (lastApp.filesAreLoaded == false))
+      if ((currentApplicationItem.CurrentView != ViewHandler.CurrentView) || (currentApplicationItem.filesAreLoaded == false))
       {
-        lastApp.LoadFiles();
-        lastApp.CurrentView = ViewHandler.CurrentView;
+        currentApplicationItem.LoadFiles();
+        currentApplicationItem.CurrentView = ViewHandler.CurrentView;
       }
       int totalFiles = 0;
-      totalFiles = totalFiles + DisplayItemList(lastApp.ItemList, facadeView);
+      totalFiles = totalFiles + DisplayItemList(currentApplicationItem.ItemList, facadeView);
       return (totalFiles);
     }
 
@@ -544,45 +518,13 @@
       return (totalApps);
     }
 
-    string BuildHistoryKey(ApplicationItem app, int viewLevel, string pathSub)
-    {
-      int appID;
-      if (app != null)
-      {
-        appID = app.ApplicationItemId;
-      }
-      else
-      {
-        appID = 1; // root
-      }
-      return String.Format("applicationItem{0}#level{1}#sub_{2}", appID, viewLevel, pathSub);
-    }
 
-    public void SaveItemIndex(string value, ApplicationItem app, string pathSub)
-    {
-      string key = BuildHistoryKey(app, ViewHandler.CurrentLevel, pathSub);
-      itemHistory.Set(value, key);
-    }
 
-    void RestoreItemIndex(ApplicationItem app, string pathSub)
-    {
-      string key = BuildHistoryKey(app, ViewHandler.CurrentLevel, pathSub);
-      string itemHist = itemHistory.Get(key);
-      if (itemHist != "")
-      {
-        int itemIndex = ProgramUtils.StringToInteger(itemHist, -1);
-        if ((itemIndex >= 0) && (itemIndex <= facadeView.Count - 1))
-        {
-          GUIControl.SelectItemControl(GetID, facadeView.GetID, itemIndex);
-        }
-      }
-    }
-
     void BackItemClicked()
     {
-      if (lastApp != null)
+      if (currentApplicationItem != null)
       {
-        if ((prevFilepath != null) && (prevFilepath != "") && (prevFilepath != lastApp.FileDirectory))
+        if ((prevFilepath != null) && (prevFilepath != "") && (prevFilepath != currentApplicationItem.FileDirectory))
         {
           // back item in filelist clicked
           prevFilepath = Path.GetDirectoryName(prevFilepath);
@@ -593,22 +535,22 @@
           {
             FilterItem curFilter;
             // force reload, this will load the next filter-level.....
-            lastApp.LoadFiles();
+            currentApplicationItem.LoadFiles();
             // auto-remove filters if there is only ONE EMPTY Filteritem
             // displaying
-            bool doAutoRemove = ((lastApp.ItemList.Count == 1) && (ViewHandler.IsFilterQuery));
+            bool doAutoRemove = ((currentApplicationItem.ItemList.Count == 1) && (ViewHandler.IsFilterQuery));
             while (doAutoRemove)
             {
               doAutoRemove = false;
-              if (lastApp.ItemList[0] is FilterItem)
+              if (currentApplicationItem.ItemList[0] is FilterItem)
               {
-                curFilter = lastApp.ItemList[0] as FilterItem;
+                curFilter = currentApplicationItem.ItemList[0] as FilterItem;
                 if ((curFilter.Title == "") && (curFilter.Title2 == ""))
                 {
                   if (ViewHandler.RemoveFilterItem())
                   {
-                    lastApp.LoadFiles();
-                    doAutoRemove = ((lastApp.ItemList.Count == 1) && (ViewHandler.IsFilterQuery));
+                    currentApplicationItem.LoadFiles();
+                    doAutoRemove = ((currentApplicationItem.ItemList.Count == 1) && (ViewHandler.IsFilterQuery));
                   }
                 }
               }
@@ -618,23 +560,23 @@
           {
             // back item in application list clicked
             // go to father item
-            lastApp = this.dbHandlerInstance.GetAppByID(lastApp.FatherID);
-            if (lastApp != null)
+            currentApplicationItem = this.dbHandlerInstance.GetAppByID(currentApplicationItem.FatherID);
+            if (currentApplicationItem != null)
             {
-              userSettings.LastAppID = lastApp.ApplicationItemId;
-              prevFilepath = lastApp.DefaultFilepath();
+              //userSettings.LastAppID = currentApplicationItem.ApplicationItemId;
+              prevFilepath = currentApplicationItem.DefaultFilepath();
             }
             else
             {
               // back to home screen.....
-              userSettings.LastAppID = -1;
+              //currentApplicationItem.ApplicationItemId = -1;
               prevFilepath = "";
             }
           }
         }
         UpdateButtonStates();
         UpdateListControl();
-        RestoreItemIndex(lastApp, prevFilepath);
+        //RestoreItemIndex(currentApplicationItem, prevFilepath);
       }
       else
       {
@@ -739,7 +681,7 @@
           dlgProgress.ShowProgressBar(false);
           curFile.FileInfoFavourite = (FileItemInfo)curFile.FileInfoList[iSelectedGame];
 
-          curFile.FindFileInfoDetail(lastApp, curFile.FileInfoFavourite, ScraperType.ALLGAME, saveType);
+          curFile.FindFileInfoDetail(currentApplicationItem, curFile.FileInfoFavourite, ScraperType.ALLGAME, saveType);
           if ((saveType == ScraperSaveType.DataAndImages) || (saveType == ScraperSaveType.Data))
           {
             //            dlgProgress.SetPercentage(60);
@@ -807,35 +749,35 @@
         if (item is ApplicationItem)
         {
 
-          lastApp = (ApplicationItem)item;
-          SaveItemIndex(GetSelectedItemNo().ToString(), lastApp, lastApp.lastFilepath);
-          userSettings.LastAppID = lastApp.ApplicationItemId;
-          prevFilepath = lastApp.DefaultFilepath();
+          currentApplicationItem = (ApplicationItem)item;
+          //SaveItemIndex(GetSelectedItemNo().ToString(), currentApplicationItem, currentApplicationItem.lastFilepath);
+
+          prevFilepath = currentApplicationItem.DefaultFilepath();
           ViewHandler.CurrentLevel = 0;
-          //lastApp.ViewHandler = ViewHandler;
+          //currentApplicationItem.ViewHandler = ViewHandler;
         }
         else if (item is FileItem)
         {
           FileItem fileItem = (FileItem)item;
           selectedItemIndex = GetSelectedItemNo();
 
-          if (lastApp != null)
+          if (currentApplicationItem != null)
           {
-            userSettings.LastAppID = lastApp.ApplicationItemId;
-            prevFilepath = lastApp.DefaultFilepath();
-            lastApp.LaunchFile(fileItem);
+
+            prevFilepath = currentApplicationItem.DefaultFilepath();
+            currentApplicationItem.LaunchFile(fileItem);
           }
         }
         else if (item is FilterItem)
         {
           FilterItem filterItem = (FilterItem)item;
 
-          SaveItemIndex(GetSelectedItemNo().ToString(), lastApp, prevFilepath);
+         // SaveItemIndex(GetSelectedItemNo().ToString(), currentApplicationItem, prevFilepath);
           ViewHandler.AddFilterItem(filterItem);
-          if (lastApp != null)
+          if (currentApplicationItem != null)
           {
             // force reload, this will load the next filter-level.....
-            lastApp.LoadFiles();
+            currentApplicationItem.LoadFiles();
           }
         }
 
@@ -892,7 +834,7 @@
       string imgFile = String.Empty;
 
       if (ProgramUtils.UseThumbsDir())
-        imgFile = ProgramUtils.GetFileImage(lastApp, curFileItem);
+        imgFile = ProgramUtils.GetFileImage(currentApplicationItem, curFileItem);
       else
         imgFile = curFileItem.Imagefile;
 
@@ -977,7 +919,7 @@
     void ShowInfoWindow()
     {
 
-      if (lastApp == null) return;
+      if (currentApplicationItem == null) return;
 
       selectedItemIndex = GetSelectedItemNo();
       GUIListItem item = GetSelectedItem();
@@ -992,7 +934,7 @@
         curFile = (FileItem)item.MusicTag;
         GUIProgramsAltFileInfo fileInfo = (GUIProgramsAltFileInfo)GUIWindowManager.GetWindow(9999);
         fileInfo.CurrentFileItem = curFile;
-        fileInfo.CurrentApplicationItem = lastApp;
+        fileInfo.CurrentApplicationItem = currentApplicationItem;
         fileInfo.FolderForThumbs = string.Empty;
         GUIWindowManager.ActivateWindow(9999);
       }
@@ -1033,7 +975,7 @@
       if (dlg.SelectedLabel == -1) return;
       if (dlg.SelectedLabel == 0)
       {
-        userSettings.ViewLayout = (int)Layout.List;
+        CurrentLayout = Layout.List;
         ViewHandler.CurrentView = GUILocalizeStrings.Get(100000 + GetID);//my files
       }
       else
@@ -1064,39 +1006,26 @@
 
     protected override void OnPageLoad()
     {
-      InitGUIProgramsAlt();
-
       base.OnPageLoad();
 
+      InitGUIProgramsAlt();
+
       if (btnSortBy != null)
         btnSortBy.SortChanged += new SortEventHandler(SortChanged);
 
-      LoadFolderSettings("");
-
-      if (skipInit)
+      if (currentApplicationItem != null)
       {
-        userSettings.LastAppID = -1;
+        currentApplicationItem = this.dbHandlerInstance.GetAppByID(currentApplicationItem.ApplicationItemId);
+        prevFilepath = currentApplicationItem.DefaultFilepath();
       }
       else
       {
-        LoadLastAppIDFromSettings(); // hacky load back the last applicationItem id, otherwise this can get lost from dx resets....
-      }
-      lastApp = this.dbHandlerInstance.GetAppByID(userSettings.LastAppID);
-
-      if (lastApp != null)
-      {
-        prevFilepath = lastApp.DefaultFilepath();
-        this.CurrentSortAsc = userSettings.SortAscending;
-        ViewHandler.CurrentLevel = userSettings.LastViewLevel;
-      }
-      else
-      {
         prevFilepath = "";
       }
 
       UpdateListControl();
       ShowThumbPanel();
-      skipInit = false;
+
     }
 
     protected override void OnPageDestroy(int newWindowId)
@@ -1131,7 +1060,6 @@
           UpdateButtonStates();
           break;
         case Action.ActionType.ACTION_CLOSE_DIALOG:
-          SaveFolderSettings("");
           GUIWindowManager.ShowPreviousWindow();
           break;
         case Action.ActionType.ACTION_SHOW_INFO:
@@ -1152,9 +1080,9 @@
             int iControl = message.SenderControlId;
             if (iControl == facadeView.GetID)
             {
-              if (lastApp != null)
+              if (currentApplicationItem != null)
               {
-                lastApp.ResetThumbs();
+                currentApplicationItem.ResetThumbs();
               }
             }
           }
@@ -1169,7 +1097,7 @@
 
       if (control == btnViewAs)
       {
-        userSettings.SwitchToNextViewLayout();
+        SwitchToNextViewLayout();
 
 
         ShowThumbPanel();
@@ -1177,10 +1105,10 @@
       }
       else if (control == btnRefresh)
       {
-        if (lastApp != null)
+        if (currentApplicationItem != null)
         {
-          lastApp.Refresh(true);
-          prevFilepath = lastApp.DefaultFilepath();
+          currentApplicationItem.Refresh(true);
+          prevFilepath = currentApplicationItem.DefaultFilepath();
           // todo: reset viewHandler
           UpdateButtonStates();
           UpdateListControl();

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj	2007-08-27 05:44:33 UTC (rev 869)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj	2007-08-27 10:30:17 UTC (rev 870)
@@ -142,7 +142,6 @@
     </Compile>
     <Compile Include="GUIProgramsAlt.cs" />
     <Compile Include="GUIProgramsAltFileInfo.cs" />
-    <Compile Include="GUIProgramsAltUserSettings.cs" />
     <Compile Include="Imports\AllGameScraper.cs" />
     <Compile Include="Imports\DirectoryImport.cs" />
     <Compile Include="Imports\GamebaseImport.cs" />

Deleted: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltUserSettings.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltUserSettings.cs	2007-08-27 05:44:33 UTC (rev 869)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltUserSettings.cs	2007-08-27 10:30:17 UTC (rev 870)
@@ -1,137 +0,0 @@
-using System;
-
-using System.Xml.Serialization;
-using System.Collections.Generic;
-using System.Text;
-
-
-using MediaPortal.GUI.Library;
-using MediaPortal.Util;
-
-namespace GUIProgramsAlt
-{
-  [Serializable]
-  public class GUIProgramsAltUserSettings
-  {
-    protected int sortMethod;
-    protected int viewLayout;
-    protected bool sortAscending;
-    protected int lastApplicationID;
-    protected int lastFileID;
-    protected int lastViewLevel;
-    protected bool overviewVisible;
-
-    public GUIProgramsAltUserSettings()
-    {
-      sortMethod = 0; //name
-      viewLayout = 0; //list
-      sortAscending = true;
-      overviewVisible = true;
-      lastApplicationID = -1;
-      lastFileID = -1;
-      lastViewLevel = 0;
-    }
-
-    [XmlElement("SortMethod")]
-    public int SortMethod
-    {
-      get { return sortMethod; }
-      set { sortMethod = value; }
-    }
-
-    [XmlElement("ViewLayout")]
-    public int ViewLayout
-    {
-      get { return viewLayout; }
-      set { viewLayout = value; }
-    }
-
-    [XmlElement("SortAscending")]
-    public bool SortAscending
-    {
-      get { return sortAscending; }
-      set { sortAscending = value; }
-    }
-
-    [XmlElement("OverviewVisible")]
-    public bool OverviewVisible
-    {
-      get { return overviewVisible; }
-      set { overviewVisible = value; }
-    }
-
-    [XmlElement("LastAppID")]
-    public int LastAppID
-    {
-      get { return lastApplicationID; }
-      set { lastApplicationID = value; }
-    }
-
-    [XmlElement("LastFileID")]
-    public int LastFileID
-    {
-      get { return lastFileID; }
-      set { lastFileID = value; }
-    }
-
-    [XmlElement("LastViewLevelID")]
-    public int LastViewLevel
-    {
-      get { return lastViewLevel; }
-      set { lastViewLevel = value; }
-    }
-
-
-    public string ViewLayoutTextName
-    {
-      get { return GetViewLayoutAsText(); }
-    }
-
-    string GetViewLayoutAsText()
-    {
-      string result = "";
-      switch ((Layout)ViewLayout)
-      {
-        case Layout.List:
-          result = GUILocalizeStrings.Get(101);
-          break;
-        case Layout.Icons:
-          result = GUILocalizeStrings.Get(100);
-          break;
-        case Layout.LargeIcons:
-          result = GUILocalizeStrings.Get(417);
-          break;
-        case Layout.FilmStrip:
-          result = GUILocalizeStrings.Get(733);
-          break;
-      }
-      return result;
-    }
-
-    public void SwitchToNextViewLayout()
-    {
-      switch ((Layout)ViewLayout)
-      {
-        case Layout.List:
-          ViewLayout = (int)Layout.Icons;
-
-          break;
-        case Layout.Icons:
-          ViewLayout = (int)Layout.LargeIcons;
-
-          break;
-        case Layout.LargeIcons:
-          ViewLayout = (int)Layout.FilmStrip;
-
-          break;
-        case Layout.FilmStrip:
-          ViewLayout = (int)Layout.List;
-
-          break;
-      }
-    }
-
-
-  }
-   
-}


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: [870] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt (Page 3)

mp-plugins-svn