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

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

Revision: 1074
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1074&view=rev
Author:   chef_koch
Date:     2007-11-18 03:51:50 -0800 (Sun, 18 Nov 2007)

Log Message:
-----------
added: option to set an application item as root, so it is possible to show it's files in root view together with other application items

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
    trunk/plugins/myGUIProgramsAlt/README.txt
    trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs	2007-11-18 03:24:29 UTC (rev 1073)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs	2007-11-18 11:51:50 UTC (rev 1074)
@@ -81,6 +81,7 @@
     DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance;
 
     ApplicationItem currentApplicationItem = null;
+    ApplicationItem rootApplicationItem = null;
     string prevFilepath = "";
     int selectedItemIndex = -1;
     Layout currentLayout = Layout.List;
@@ -434,7 +435,7 @@
       int TotalItems = 0;
       if (ApplicationItemSubItemsAllowed())
         TotalItems += DisplayApps();
-      if (IsCurrentApplicationItemNotNull())
+      //if (IsCurrentApplicationItemNotNull()) trying to display Files in root folder
         TotalItems += DisplayFiles();
 
       if (currentApplicationItem != null)
@@ -452,7 +453,7 @@
 
     int DisplayFiles()
     {
-      if (currentApplicationItem == null) return 0;
+      if (currentApplicationItem == null) return DisplayRootFiles();
 
       // Refresh FileList if view has changed, while this appItem was not active
       if ((currentApplicationItem.CurrentView != ViewHandler.CurrentView) || (currentApplicationItem.filesAreLoaded == false))
@@ -465,6 +466,22 @@
       return (totalFiles);
     }
 
+    int DisplayRootFiles()
+    {
+      foreach (ApplicationItem applicationItem in AppsOfFatherID(currentApplicationItem == null ? -1 : currentApplicationItem.ApplicationItemId))
+      {
+        if (!applicationItem.Title.Equals(@"@ROOT@")) continue;
+        rootApplicationItem = applicationItem;
+      }
+      if (rootApplicationItem == null) return 0;
+
+      rootApplicationItem.LoadFiles();
+
+      int totalFiles = 0;
+      totalFiles = totalFiles + DisplayItemList(rootApplicationItem.ItemList, facadeView);
+      return (totalFiles);
+    }
+
     int DisplayApps()
     {
       int totalApps = 0;
@@ -472,7 +489,8 @@
       foreach (ApplicationItem applicationItem in AppsOfFatherID(currentApplicationItem == null ? -1 : currentApplicationItem.ApplicationItemId))
       {
         if (!applicationItem.Enabled) continue;
-
+        if (applicationItem.Title.Equals(@"@ROOT@")) continue;
+        
         totalApps++;
         GUIListItem item = new GUIListItem(applicationItem.Title);
 
@@ -648,6 +666,11 @@
             prevFilepath = currentApplicationItem.DefaultFilepath();
             currentApplicationItem.LaunchFile(fileItem);
           }
+          else
+          {
+            prevFilepath = rootApplicationItem.DefaultFilepath();
+            rootApplicationItem.LaunchFile(fileItem);
+          }
         }
         else if (item is FilterItem)
         {

Modified: trunk/plugins/myGUIProgramsAlt/README.txt
===================================================================
--- trunk/plugins/myGUIProgramsAlt/README.txt	2007-11-18 03:24:29 UTC (rev 1073)
+++ trunk/plugins/myGUIProgramsAlt/README.txt	2007-11-18 11:51:50 UTC (rev 1074)
@@ -30,6 +30,9 @@
 ---------------
 -- ChangeLog --
 ---------------
+v0.1.0.10
+2007-11-18:   chefkoch     : added: option to set an application item as root, so it is possible to show it's files in root view together with other application items
+
 v0.1.0.9
 2007-11-04:   chefkoch     : changed: remember last used application is now optional
 

Modified: trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp
===================================================================
--- trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp	2007-11-18 03:24:29 UTC (rev 1073)
+++ trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp	2007-11-18 11:51:50 UTC (rev 1074)
@@ -8,7 +8,7 @@
 			<Source>GUIProgramsAlt\bin\Release\GUIProgramsAlt.dll</Source>
 			<Id>01010</Id>
 			<Option />
-			<Guid>71910bfb-9ee2-445d-9c76-b93aba6bced3</Guid>
+			<Guid>57893c55-dcc4-4a2f-bc23-b05c7c653c7e</Guid>
 		</File>
 		<File>
 			<FileName>myProgramsAlt.xml</FileName>
@@ -17,7 +17,7 @@
 			<Source>GUIProgramsAlt\skin\BlueTwo\myProgramsAlt.xml</Source>
 			<Id>02010</Id>
 			<Option>OutputFileName=|DefaultFile=True|</Option>
-			<Guid>062d6b00-83c7-4876-8f0b-debb2bed6c5b</Guid>
+			<Guid>972438e5-d3cc-4e34-9aaa-6ae9cf39b023</Guid>
 		</File>
 		<File>
 			<FileName>myProgramsAltFileInfo.xml</FileName>
@@ -26,7 +26,7 @@
 			<Source>GUIProgramsAlt\skin\BlueTwo\myProgramsAltFileInfo.xml</Source>
 			<Id>02010</Id>
 			<Option>OutputFileName=|DefaultFile=True|</Option>
-			<Guid>7dde964f-674f-4b41-923e-cb2c5d00c12c</Guid>
+			<Guid>58a988af-5557-4ec9-a0b7-2b862c6f9887</Guid>
 		</File>
 		<File>
 			<FileName>myProgramsAltPreconfiguration.xml</FileName>
@@ -35,7 +35,7 @@
 			<Source>GUIProgramsAlt\MetaData\myProgramsAltPreconfiguration.xml</Source>
 			<Id>02010</Id>
 			<Option />
-			<Guid>da68b967-88fd-4509-b0d1-16a9f6c435ab</Guid>
+			<Guid>1a909c22-67c5-4915-8c92-e7464d416e0a</Guid>
 		</File>
 		<File>
 			<FileName>README.txt</FileName>
@@ -44,7 +44,7 @@
 			<Source>README.txt</Source>
 			<Id>04010</Id>
 			<Option>OutputFileName=MyPrograms2_ReadMe|DefaultFile=False|</Option>
-			<Guid>418d38f1-3fb9-4d12-b190-d9e4315f6f3a</Guid>
+			<Guid>1d7ab3ca-a21a-4953-ac24-ffd485215ae1</Guid>
 		</File>
 		<File>
 			<FileName>System.Data.SQLite.DLL</FileName>
@@ -53,7 +53,7 @@
 			<Source>GUIProgramsAlt\bin\Release\System.Data.SQLite.DLL</Source>
 			<Id>04010</Id>
 			<Option />
-			<Guid>b4d409d8-4fbd-43f3-81d7-5062f19ee48a</Guid>
+			<Guid>17cf81f6-0105-42f2-aaa4-9246a856d21a</Guid>
 		</File>
 	</FileList>
 	<StringList />
@@ -68,7 +68,7 @@
 		<ProiectName>MyPrograms2</ProiectName>
 		<Author>chefkoch,northern</Author>
 		<UpdateURL>http://www.team-mediaportal.com</UpdateURL>
-		<Version>0.1.0.9</Version>
+		<Version>0.1.0.10</Version>
 		<Description>myprograms2 is a complete rewrite of weabeard's MyPrograms plugin. it's able to start apps and games.</Description>
 		<Group>Games</Group>
 		<Release>Test</Release>


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