[Mp-plugins-svn] SF.net SVN: mp-plugins:[3709] trunk/plugins/File Explorer

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3709
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3709&view=rev
Author:   SilentException
Date:     2010-08-11 12:11:27 +0000 (Wed, 11 Aug 2010)

Log Message:
-----------
FileExplorer
 - reverted some changes from r3708
 - fixed display of picture files (using slide show)
 - updated version info to 1.5

Modified Paths:
--------------
    trunk/plugins/File Explorer/Dialogs/GUIDialogOperation.cs
    trunk/plugins/File Explorer/DrivesView.cs
    trunk/plugins/File Explorer/File Explorer.csproj
    trunk/plugins/File Explorer/Properties/AssemblyInfo.cs

Added Paths:
-----------
    trunk/plugins/File Explorer/Skin/Blue3/File Explorer_dialog.xml
    trunk/plugins/File Explorer/Skin/Blue3wide/File Explorer_dialog.xml
    trunk/plugins/File Explorer/Skin/BlueTwo/File Explorer_dialog.xml
    trunk/plugins/File Explorer/Skin/Xface/File Explorer_dialog.xml

Modified: trunk/plugins/File Explorer/Dialogs/GUIDialogOperation.cs
===================================================================

--- trunk/plugins/File Explorer/Dialogs/GUIDialogOperation.cs	2010-08-10 16:13:12 UTC (rev 3708)
+++ trunk/plugins/File Explorer/Dialogs/GUIDialogOperation.cs	2010-08-11 12:11:27 UTC (rev 3709)
@@ -433,6 +433,11 @@
       set { base.GetID = value; }
     }
 
+    public override bool Init()
+    {
+      return Load(GUIGraphicsContext.Skin + "\\File Explorer_dialog.xml");
+    }
+
     public override void OnAction(Action action)
     {
       if (action.wID == Action.ActionType.ACTION_CLOSE_DIALOG || action.wID == Action.ActionType.ACTION_PREVIOUS_MENU)

Modified: trunk/plugins/File Explorer/DrivesView.cs
===================================================================
--- trunk/plugins/File Explorer/DrivesView.cs	2010-08-10 16:13:12 UTC (rev 3708)
+++ trunk/plugins/File Explorer/DrivesView.cs	2010-08-11 12:11:27 UTC (rev 3709)
@@ -33,6 +33,7 @@
 using FileIO = Microsoft.VisualBasic.FileIO;
 using System.Runtime.InteropServices;
 using MediaPortal.Configuration;
+using MediaPortal.GUI.Pictures;
 
 namespace FileExplorer
 {
@@ -2548,7 +2549,39 @@
           dlgOK.DoModal(GUIWindowManager.ActiveWindow);
         }
       }
+    }
+    #endregion
 
+    #region Picture display
+    private void OnShowPicture(string strFile)
+    {
+      GUISlideShow SlideShow = (GUISlideShow)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_SLIDESHOW);
+      if (SlideShow == null)
+      {
+        return;
+      }
+
+      SlideShow.Reset();
+      SlideShow.Add(strFile);
+      /*
+      for (int i = 0; i < GetItemCount(); ++i)
+      {
+        GUIListItem item = GetItem(i);
+        if (!item.IsFolder)
+        {
+          if (item.IsRemote)
+          {
+            continue;
+          }
+          SlideShow.Add(item.Path);
+        }
+      }
+      */
+      if (SlideShow.Count > 0)
+      {
+        GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_SLIDESHOW);
+        SlideShow.Select(strFile);
+      }
     }
     #endregion
     #endregion
@@ -2679,8 +2712,9 @@
                 if (e.ToLower().Trim().Equals(ext))
                 {
                   //MediaPortal.Player.g_Player.Play(info.File.Path + "\\" + info.File.Name);
-                  MediaPortal.Player.g_Player.Play(CombinePathAndFilename(info.File.Path, info.File.Name));
-                  MediaPortal.Player.g_Player.ShowFullScreenWindow();
+                  //MediaPortal.Player.g_Player.Play(CombinePathAndFilename(info.File.Path, info.File.Name));
+                  //MediaPortal.Player.g_Player.ShowFullScreenWindow();
+                  OnShowPicture(CombinePathAndFilename(info.File.Path, info.File.Name));
                   //GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO);
                   return;
                 }

Modified: trunk/plugins/File Explorer/File Explorer.csproj
===================================================================
--- trunk/plugins/File Explorer/File Explorer.csproj	2010-08-10 16:13:12 UTC (rev 3708)
+++ trunk/plugins/File Explorer/File Explorer.csproj	2010-08-11 12:11:27 UTC (rev 3709)
@@ -64,6 +64,11 @@
       <HintPath>..\..\mediaportal\xbmc\bin\Release\Utils.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="WindowPlugins, Version=1.1.0.16062, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\mediaportal\xbmc\bin\Release\plugins\Windows\WindowPlugins.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="LocalizeStrings.cs" />
@@ -93,17 +98,20 @@
     <Content Include="Language\strings_de.xml" />
     <Content Include="Language\strings_en.xml" />
     <Content Include="Language\strings_fr.xml" />
+    <Content Include="Skin\Blue3wide\File Explorer_dialog.xml" />
     <Content Include="Skin\Blue3wide\File Explorer_main.xml" />
     <Content Include="Skin\Blue3wide\File Explorer_textpreview.xml" />
     <Content Include="Skin\Blue3wide\Media\buttonNF_file explorer.png" />
     <Content Include="Skin\Blue3wide\Media\button_file explorer.png" />
     <Content Include="Skin\Blue3wide\Media\hover_file explorer.png" />
+    <Content Include="Skin\Blue3\File Explorer_dialog.xml" />
     <Content Include="Skin\Blue3\File Explorer_main.xml" />
     <Content Include="Skin\Blue3\File Explorer_textpreview.xml" />
     <Content Include="Skin\Blue3\Media\buttonNF_file explorer.png" />
     <Content Include="Skin\Blue3\Media\button_file explorer.png" />
     <Content Include="Skin\Blue3\Media\hover_file explorer.png" />
     <Content Include="Skin\Xface\common.window.file_explorer.xml" />
+    <Content Include="Skin\Xface\File Explorer_dialog.xml" />
     <Content Include="Skin\Xface\File Explorer_main.xml" />
     <Content Include="Skin\Xface\File Explorer_textpreview.xml" />
     <Content Include="Skin\Xface\Media\buttonNF_file explorer.png" />

Modified: trunk/plugins/File Explorer/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/File Explorer/Properties/AssemblyInfo.cs	2010-08-10 16:13:12 UTC (rev 3708)
+++ trunk/plugins/File Explorer/Properties/AssemblyInfo.cs	2010-08-11 12:11:27 UTC (rev 3709)
@@ -28,4 +28,4 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]

Added: trunk/plugins/File Explorer/Skin/Blue3/File Explorer_dialog.xml
===================================================================
--- trunk/plugins/File Explorer/Skin/Blue3/File Explorer_dialog.xml	                        (rev 0)
+++ trunk/plugins/File Explorer/Skin/Blue3/File Explorer_dialog.xml	2010-08-11 12:11:27 UTC (rev 3709)
@@ -0,0 +1,46 @@
+<window>
+	<id>557316</id>
+	<defaultcontrol>10</defaultcontrol>
+	<allowoverlay>no</allowoverlay>
+	<controls>
+		<control>
+			<type>image</type>
+			<id>0</id>
+			<posX>177</posX>
+			<posY>225</posY>
+			<width>409</width>
+			<height>202</height>
+			<texture>dialog_background.png</texture>
+		</control>
+		<control>
+			<description>dialog Heading</description>
+			<type>fadelabel</type>
+			<id>2</id>
+			<posX>190</posX>
+			<posY>230</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+		<control>
+			<description>dialog line 1</description>
+			<type>fadelabel</type>
+			<id>3</id>
+			<posX>190</posX>
+			<posY>260</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+		<control>
+			<description>dialog line 2</description>
+			<type>fadelabel</type>
+			<id>4</id>
+			<posX>190</posX>
+			<posY>280</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+	</controls>
+</window>

Added: trunk/plugins/File Explorer/Skin/Blue3wide/File Explorer_dialog.xml
===================================================================
--- trunk/plugins/File Explorer/Skin/Blue3wide/File Explorer_dialog.xml	                        (rev 0)
+++ trunk/plugins/File Explorer/Skin/Blue3wide/File Explorer_dialog.xml	2010-08-11 12:11:27 UTC (rev 3709)
@@ -0,0 +1,46 @@
+<window>
+	<id>557316</id>
+	<defaultcontrol>10</defaultcontrol>
+	<allowoverlay>no</allowoverlay>
+	<controls>
+		<control>
+			<type>image</type>
+			<id>0</id>
+			<posX>177</posX>
+			<posY>225</posY>
+			<width>409</width>
+			<height>202</height>
+			<texture>dialog_background.png</texture>
+		</control>
+		<control>
+			<description>dialog Heading</description>
+			<type>fadelabel</type>
+			<id>2</id>
+			<posX>190</posX>
+			<posY>230</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+		<control>
+			<description>dialog line 1</description>
+			<type>fadelabel</type>
+			<id>3</id>
+			<posX>190</posX>
+			<posY>260</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+		<control>
+			<description>dialog line 2</description>
+			<type>fadelabel</type>
+			<id>4</id>
+			<posX>190</posX>
+			<posY>280</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+	</controls>
+</window>

Added: trunk/plugins/File Explorer/Skin/BlueTwo/File Explorer_dialog.xml
===================================================================
--- trunk/plugins/File Explorer/Skin/BlueTwo/File Explorer_dialog.xml	                        (rev 0)
+++ trunk/plugins/File Explorer/Skin/BlueTwo/File Explorer_dialog.xml	2010-08-11 12:11:27 UTC (rev 3709)
@@ -0,0 +1,46 @@
+<window>
+	<id>557316</id>
+	<defaultcontrol>10</defaultcontrol>
+	<allowoverlay>no</allowoverlay>
+	<controls>
+		<control>
+			<type>image</type>
+			<id>0</id>
+			<posX>177</posX>
+			<posY>225</posY>
+			<width>409</width>
+			<height>202</height>
+			<texture>dialog_background.png</texture>
+		</control>
+		<control>
+			<description>dialog Heading</description>
+			<type>fadelabel</type>
+			<id>2</id>
+			<posX>190</posX>
+			<posY>230</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+		<control>
+			<description>dialog line 1</description>
+			<type>fadelabel</type>
+			<id>3</id>
+			<posX>190</posX>
+			<posY>260</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+		<control>
+			<description>dialog line 2</description>
+			<type>fadelabel</type>
+			<id>4</id>
+			<posX>190</posX>
+			<posY>280</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+	</controls>
+</window>

Added: trunk/plugins/File Explorer/Skin/Xface/File Explorer_dialog.xml
===================================================================
--- trunk/plugins/File Explorer/Skin/Xface/File Explorer_dialog.xml	                        (rev 0)
+++ trunk/plugins/File Explorer/Skin/Xface/File Explorer_dialog.xml	2010-08-11 12:11:27 UTC (rev 3709)
@@ -0,0 +1,46 @@
+<window>
+	<id>557316</id>
+	<defaultcontrol>10</defaultcontrol>
+	<allowoverlay>no</allowoverlay>
+	<controls>
+		<control>
+			<type>image</type>
+			<id>0</id>
+			<posX>177</posX>
+			<posY>225</posY>
+			<width>409</width>
+			<height>202</height>
+			<texture>dialog_background.png</texture>
+		</control>
+		<control>
+			<description>dialog Heading</description>
+			<type>fadelabel</type>
+			<id>2</id>
+			<posX>190</posX>
+			<posY>230</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+		<control>
+			<description>dialog line 1</description>
+			<type>fadelabel</type>
+			<id>3</id>
+			<posX>190</posX>
+			<posY>260</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+		<control>
+			<description>dialog line 2</description>
+			<type>fadelabel</type>
+			<id>4</id>
+			<posX>190</posX>
+			<posY>280</posY>
+			<label>0</label>
+			<font>font13</font>
+			<textcolor>ffffffff</textcolor>
+		</control>
+	</controls>
+</window>


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


