[Mp-plugins-svn] SF.net SVN: mp-plugins: [614] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt /ApplicationItems/ApplicationItem.cs

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

Revision: 614
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=614&view=rev
Author:   chef_koch
Date:     2007-06-24 01:33:23 -0700 (Sun, 24 Jun 2007)

Log Message:
-----------
small cleanup

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs	2007-06-24 08:03:48 UTC (rev 613)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs	2007-06-24 08:33:23 UTC (rev 614)
@@ -386,14 +386,9 @@
 
     public FileItem PrevFile(FileItem curFile)
     {
-      if (Files == null)
-      {
-        return null;
-      }
-      if (Files.Count == 0)
-      {
-        return null;
-      }
+      if (Files == null) return null;
+      if (Files.Count == 0) return null;
+
       int index = this.Files.IndexOf(curFile);
       index = index - 1;
       if (index < 0)
@@ -403,14 +398,9 @@
 
     public FileItem NextFile(FileItem curFile)
     {
-      if (Files == null)
-      {
-        return null;
-      }
-      if (Files.Count == 0)
-      {
-        return null;
-      }
+      if (Files == null) return null;
+      if (Files.Count == 0) return null;
+
       int index = this.Files.IndexOf(curFile);
       index = index + 1;
       if (index > Files.Count - 1)
@@ -418,10 +408,12 @@
       return (FileItem)Files[index];
     }
 
+    /// <summary>
+    /// look for FileItem and launch it using the found object
+    /// </summary>
+    /// <param name="guiListItem"></param>
     public virtual void LaunchFile(GUIListItem guiListItem)
     {
-      // Launch File by GUILISTITEM
-      // => look for FileItem and launch it using the found object
       if (guiListItem.MusicTag == null) return;
       FileItem curFileItem = (FileItem)guiListItem.MusicTag;
       if (curFileItem == null) return;
@@ -538,8 +530,6 @@
       this.OnLaunchFilelink(curLink, MPGUIMode);
     }
 
-
-
     void proc_Exited(object sender, EventArgs e)
     {
 
@@ -669,24 +659,24 @@
       return totalItems;
     }
 
-    void OnRetrieveCoverArt(GUIListItem gli)
+    void OnRetrieveCoverArt(GUIListItem guiListItem)
     {
-      if ((gli.MusicTag != null) && (gli.MusicTag is FileItem))
+      if (guiListItem.MusicTag == null) return;
+      FileItem curFileItem = (FileItem)guiListItem.MusicTag;
+      if (curFileItem == null) return;
+
+      if (curFileItem.Imagefile != "")
       {
-        FileItem curFile = (FileItem)gli.MusicTag;
-        if (curFile.Imagefile != "")
-        {
-          gli.ThumbnailImage = curFile.Imagefile;
-          gli.IconImageBig = curFile.Imagefile;
-          gli.IconImage = curFile.Imagefile;
-        }
-        else
-        {
-          gli.ThumbnailImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
-          gli.IconImageBig = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
-          gli.IconImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderNF.png";
-        }
+        guiListItem.ThumbnailImage = curFileItem.Imagefile;
+        guiListItem.IconImageBig = curFileItem.Imagefile;
+        guiListItem.IconImage = curFileItem.Imagefile;
       }
+      else
+      {
+        guiListItem.ThumbnailImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
+        guiListItem.IconImageBig = GUIGraphicsContext.Skin + @"\media\DefaultFolderBig.png";
+        guiListItem.IconImage = GUIGraphicsContext.Skin + @"\media\DefaultFolderNF.png";
+      }
     }
 
     /* private void OnItemSelected(GUIListItem item, GUIControl parent)
@@ -719,22 +709,19 @@
     public virtual void OnInfo(GUIListItem item, ref bool isOverviewVisible, ref ProgramInfoAction modalResult, ref int selectedFileID)
     {
       GUIFileInfo fileInfoDialog = (GUIFileInfo)GUIWindowManager.GetWindow(ProgramUtils.ProgramInfoID);
-      if (null != fileInfoDialog)
-      {
-        if (item.MusicTag == null)
-        {
-          return;
-        }
-        FileItem curFile = (FileItem)item.MusicTag;
-        fileInfoDialog.App = this;
-        fileInfoDialog.File = curFile;
-        fileInfoDialog.IsOverviewVisible = isOverviewVisible;
-        fileInfoDialog.DoModal(GetID);
-        isOverviewVisible = fileInfoDialog.IsOverviewVisible;
-        modalResult = fileInfoDialog.ModalResult;
-        selectedFileID = fileInfoDialog.SelectedFileID;
-        return;
-      }
+      if (fileInfoDialog == null) return;
+      if (item.MusicTag == null) return;
+      FileItem curFile = (FileItem)item.MusicTag;
+      if (curFile == null) return;
+
+      fileInfoDialog.App = this;
+      fileInfoDialog.File = curFile;
+      fileInfoDialog.IsOverviewVisible = isOverviewVisible;
+      fileInfoDialog.DoModal(GetID);
+      isOverviewVisible = fileInfoDialog.IsOverviewVisible;
+      modalResult = fileInfoDialog.ModalResult;
+      selectedFileID = fileInfoDialog.SelectedFileID;
+      return;
     }
 
 


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