[Mp-plugins-svn] SF.net SVN: mp-plugins: [794] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt

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

Revision: 794
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=794&view=rev
Author:   chef_koch
Date:     2007-08-05 10:23:42 -0700 (Sun, 05 Aug 2007)

Log Message:
-----------
added methods to ProgramUtils for loading and parsing: slideSpeed/SleepTime and UseThumbsDir
-> no parsing in each LoadSettings of configForm or in GUIPrograms is needed

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs	2007-08-05 11:25:44 UTC (rev 793)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIPrograms.cs	2007-08-05 17:23:42 UTC (rev 794)
@@ -311,13 +311,8 @@
 
     void LoadSettings()
     {
-      string _slideSpeed = DatabaseHandler.ReadSetting(ProgramUtils.cSLIDESPEED);
+      slideSpeed = ProgramUtils.GetSleepTime();
 
-      if ((_slideSpeed != "") && (_slideSpeed != null))
-      {
-        slideSpeed = int.Parse(_slideSpeed);
-      }
-
       using (Settings xmlreader = new Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
       {
         string curText = "";
@@ -935,29 +930,39 @@
     int DisplayApps()
     {
       int totalApps = 0;
+
       foreach (ApplicationItem applicationItem in AppsOfFatherID(GetCurrentFatherID()))
       {
-        if (applicationItem.Enabled)
+        if (!applicationItem.Enabled) continue;
+
+        totalApps++;
+        GUIListItem item = new GUIListItem(applicationItem.Title);
+
+        // check whether to use thumbsdir or not
+        string imgFile = String.Empty;
+        if (ProgramUtils.UseThumbsDir())
+          imgFile = ProgramUtils.GetApplicationImage(applicationItem.Title);
+        else
+          imgFile = applicationItem.Imagefile;
+
+        // use skin default image if file does not exist
+        if (File.Exists(imgFile))
         {
-          totalApps = totalApps + 1;
-          GUIListItem item = new GUIListItem(applicationItem.Title);
-          if (applicationItem.Imagefile != "")
-          {
-            item.ThumbnailImage = applicationItem.Imagefile;
-            item.IconImageBig = applicationItem.Imagefile;
-            item.IconImage = applicationItem.Imagefile;
-          }
-          else
-          {
-            item.ThumbnailImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
-            item.IconImageBig = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
-            item.IconImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderNF.png";
-          }
-          item.MusicTag = applicationItem;
-          //item.IsFolder = true; // pseudo-folder....
-          item.OnItemSelected += new GUIListItem.ItemSelectedHandler(OnItemSelected);
-          facadeView.Add(item);
+          item.ThumbnailImage = imgFile;
+          item.IconImageBig = imgFile;
+          item.IconImage = imgFile;
         }
+        else
+        {
+          item.ThumbnailImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
+          item.IconImageBig = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
+          item.IconImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderNF.png";
+        }
+
+        item.MusicTag = applicationItem;
+        //item.IsFolder = true; // pseudo-folder....
+        item.OnItemSelected += new GUIListItem.ItemSelectedHandler(OnItemSelected);
+        facadeView.Add(item);
       }
       return (totalApps);
     }

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs	2007-08-05 11:25:44 UTC (rev 793)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs	2007-08-05 17:23:42 UTC (rev 794)
@@ -125,16 +125,7 @@
 		}
 		public string Imagefile
 		{
-			get
-			{
-				if ( File.Exists( imageFile ) )
-					return imageFile;
-				else
-					return MediaPortal.Util.Utils.GetCoverArtName(
-						Config.GetSubFolder( Config.Dir.Thumbs, @"MyProgramsAlt" ),
-						this.Title
-						);
-			}
+			get { return imageFile; }
 			set { imageFile = value; }
 		}
 

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs	2007-08-05 11:25:44 UTC (rev 793)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs	2007-08-05 17:23:42 UTC (rev 794)
@@ -47,6 +47,7 @@
 using MediaPortal.Util;
 
 using GUIPrograms.Database;
+using MediaPortal.Configuration;
 
 namespace GUIPrograms
 {
@@ -98,6 +99,7 @@
     public const int ProgramInfoID = 1206; // some magic number, sync with DialogAppInfo.xml
     public const string cBackLabel = "..";
     public const string cDefaultPluginTitle = "My Programs Alt.";
+    public const int cDefaultSleepTime = 3000;
 
     public const string cMAMEDIRECT = "MAME_DIRECT";
     public const string cDIRCACHE = "DIR_CACHE";
@@ -394,12 +396,38 @@
 
     }
 
+    #region Thumb/Image stuff
+
+    public static int GetSleepTime()
+    {
+      int sleepTime;
+
+      if (int.TryParse(DatabaseHandler.ReadSetting(ProgramUtils.cSLIDESPEED), out sleepTime))
+        return sleepTime;
+      else
+        return cDefaultSleepTime;
+    }
+
     public static bool UseThumbsDir()
     {
-      if (DatabaseHandler.KeyExists(ProgramUtils.cUSE_MP_THUMBS_DIR))
-        return bool.Parse(DatabaseHandler.ReadSetting(ProgramUtils.cUSE_MP_THUMBS_DIR));
+      bool useThumbsDir;
+
+      if (bool.TryParse(DatabaseHandler.ReadSetting(ProgramUtils.cUSE_MP_THUMBS_DIR), out useThumbsDir))
+        return useThumbsDir;
       else
         return true;
     }
+
+    public static string GetPluginThumbFolder()
+    {
+      return Config.GetSubFolder(Config.Dir.Thumbs, @"MyProgramsAlt");
+    }
+
+    public static string GetApplicationImage(string applicationTitle)
+    {
+      return MediaPortal.Util.Utils.GetCoverArtName(GetPluginThumbFolder(), applicationTitle);
+    }
+
+    #endregion
   }
 }
\ No newline at end of file


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