Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [955] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt
|
From: <nor...@us...> - 2007-09-24 19:21:06
|
Revision: 955
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=955&view=rev
Author: northern_sky
Date: 2007-09-24 12:20:56 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
recurse extensions fixed
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd 2007-09-24 13:59:44 UTC (rev 954)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd 2007-09-24 19:20:56 UTC (rev 955)
@@ -8,7 +8,7 @@
<HashCode>AKIYAABCAAEaMAEwAAAAAAAAAFlAAAEACEACAABEoAA=</HashCode>
</TypeIdentifier>
</Class>
- <Class Name="GUIProgramsAlt.Design.AppSettingsFilesImportProgress" Collapsed="true">
+ <Class Name="GUIProgramsAlt.Design.AppSettingsFilesImportProgress">
<Position X="3" Y="3.5" Width="1.5" />
<TypeIdentifier>
<FileName>Design\AppFilesImportProgress.cs</FileName>
@@ -19,7 +19,7 @@
<Position X="16.25" Y="0.5" Width="1.5" />
<TypeIdentifier>
<FileName>Design\AppFilesView.cs</FileName>
- <HashCode>oAANBAJFSCBB8ECgSJCCQIRigVMQACQBQmSUgUQRCNE=</HashCode>
+ <HashCode>oAANBAJFSCBB8ECgSJCCQIZigVMQAjQBQmSUwUQRCNE=</HashCode>
</TypeIdentifier>
</Class>
<Class Name="GUIProgramsAlt.Design.AppSettingsBase" Collapsed="true">
@@ -103,14 +103,14 @@
<Position X="18" Y="3.5" Width="1.5" />
<TypeIdentifier>
<FileName>Design\SetupForm.cs</FileName>
- <HashCode>xqnowBGYG3JKfJwlBOCIEETiVZM6QmVoVEie0NAzAXM=</HashCode>
+ <HashCode>xqnowBGYG3JKfJwlBOKIEETiVZM6QmVoVEie0NAzAXM=</HashCode>
</TypeIdentifier>
</Class>
<Class Name="GUIProgramsAlt.GUIProgramsAlt" Collapsed="true" BaseTypeListCollapsed="true">
<Position X="21.5" Y="1.5" Width="1.5" />
<TypeIdentifier>
<FileName>GUIProgramsAlt.cs</FileName>
- <HashCode>IPJEILBSQgAlAIR4ggEgCBMAAQBFb0FBKFGCZhAAZSg=</HashCode>
+ <HashCode>IPJEILBSQgAlAIR4ggEgCAMAAQBFb0FBKFGCZhAAZSg=</HashCode>
</TypeIdentifier>
<Lollipop Position="0.2" Collapsed="true" />
</Class>
@@ -118,7 +118,7 @@
<Position X="14.5" Y="2.5" Width="1.5" />
<TypeIdentifier>
<FileName>GUIProgramsAltFileInfo.cs</FileName>
- <HashCode>AEQIAQEBggFRANBACAgRCAgMBUAIAEBBgACLYAYEBAA=</HashCode>
+ <HashCode>AAQIAQEBggFRANBACAgRCAgMBUAIAEBBiACLYAYEBAA=</HashCode>
</TypeIdentifier>
<Lollipop Position="0.2" Collapsed="true" />
</Class>
@@ -183,14 +183,14 @@
<Position X="5" Y="8.75" Width="1.5" />
<TypeIdentifier>
<FileName>Imports\MameImport.cs</FileName>
- <HashCode>qACAgAEAGAAAEAABAAAEAAgCgAASABAAGwAQBIEAAAA=</HashCode>
+ <HashCode>qACAgAEAGAAAEAABAAAEAAgCgAASABAAGwAQFIEAAAA=</HashCode>
</TypeIdentifier>
</Class>
<Class Name="GUIProgramsAlt.Items.ApplicationItem" Collapsed="true">
<Position X="3.75" Y="4.5" Width="1.5" />
<TypeIdentifier>
<FileName>Items\ApplicationItem.cs</FileName>
- <HashCode>hD6AAsRiQzNHIuPwpIiN4gIAmZcqBAkYqGVmCZkEpYA=</HashCode>
+ <HashCode>hD6AAsTiQjNHIuPwpIiN4gIEmZcqBAkYqGVmCZkEpYA=</HashCode>
</TypeIdentifier>
</Class>
<Class Name="GUIProgramsAlt.Items.ApplicationItemDirectoryCache" Collapsed="true">
@@ -308,7 +308,7 @@
<Position X="14.5" Y="4.75" Width="1.5" />
<TypeIdentifier>
<FileName>ProgramUtils.cs</FileName>
- <HashCode>AAAAAAAAAgAAAAAAAACAAAAAAAAAAAAAAAAQAAIAAAA=</HashCode>
+ <HashCode>AAAAAAAAAgAAAAAAAACAAAAAQAAAAAAAAAAQAQIAAAA=</HashCode>
</TypeIdentifier>
</Enum>
</ClassDiagram>
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-09-24 13:59:44 UTC (rev 954)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-09-24 19:20:56 UTC (rev 955)
@@ -704,7 +704,25 @@
protected void fileExtensionsbutton_Click(object sender, EventArgs e)
{
- fileExtensionsTextBox.Text = ProgramUtils.GetAvailableExtensions(this.fileDirTextBox.Text);
+ char separator = ';';
+ string result = string.Empty;
+ List<string> tmpList = new List<string>();
+ ProgramUtils.GetAvailableExtensions(this.fileDirTextBox.Text, tmpList);
+
+ foreach (string ext in tmpList)
+ {
+ if (result == "")
+ {
+ result += ext;
+ }
+ else
+ {
+ result += separator + ext;
+ }
+ }
+
+
+ fileExtensionsTextBox.Text = result;
}
public void SetupFileView()
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-09-24 13:59:44 UTC (rev 954)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-09-24 19:20:56 UTC (rev 955)
@@ -45,9 +45,13 @@
//
// shellexecuteCheckBox
//
- this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileItem-" +
- "extension.\r\nYou can omit the \"Launching Application\" in this case.");
+ this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileI" +
+ "tem-extension.\r\nYou can omit the \"Launching Application\" in this case.");
//
+ // waitExitCheckBox
+ //
+ this.toolTip.SetToolTip(this.waitExitCheckBox, "If you want mediaportal to wait for exit while running application.");
+ //
// applicationArgumentsLabel
//
this.toolTip.SetToolTip(this.applicationArgumentsLabel, "Optional arguments that are needed to launch the program \r\n\r\n(advanced hint: Use " +
@@ -92,7 +96,7 @@
// historyDatLink
//
this.historyDatLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.historyDatLink.Location = new System.Drawing.Point(6, 61);
+ this.historyDatLink.Location = new System.Drawing.Point(6, 32);
this.historyDatLink.Name = "historyDatLink";
this.historyDatLink.Size = new System.Drawing.Size(164, 16);
this.historyDatLink.TabIndex = 81;
@@ -104,7 +108,7 @@
// catverLink
//
this.catverLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.catverLink.Location = new System.Drawing.Point(6, 45);
+ this.catverLink.Location = new System.Drawing.Point(6, 16);
this.catverLink.Name = "catverLink";
this.catverLink.Size = new System.Drawing.Size(150, 16);
this.catverLink.TabIndex = 80;
@@ -122,7 +126,6 @@
this.groupBox1.Size = new System.Drawing.Size(226, 87);
this.groupBox1.TabIndex = 82;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Add CATVER.INI and HISTORY.DAT in your mame.exe folder for full dataimport";
//
// AppSettingsMame
//
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-09-24 13:59:44 UTC (rev 954)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItem.cs 2007-09-24 19:20:56 UTC (rev 955)
@@ -95,13 +95,19 @@
{
progressDialog.Close();
}
+
+
OnImportFinished(this, null);
+ FixFileLinks();
+
if (progressDialog != null)
{
progressDialog.Close();
progressDialog.ShowWaitCursor = false;
}
+
+
}
#endregion Events/Delegates
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs 2007-09-24 13:59:44 UTC (rev 954)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemDirectoryCache.cs 2007-09-24 19:20:56 UTC (rev 955)
@@ -79,7 +79,6 @@
public override void Refresh(bool mpGuiMode)
{
Import(mpGuiMode);
- FixFileLinks();
}
protected override void Import(bool mpGUIMode)
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs 2007-09-24 13:59:44 UTC (rev 954)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemGameBase.cs 2007-09-24 19:20:56 UTC (rev 955)
@@ -78,7 +78,6 @@
{
DeleteFiles();
Import(bGUIMode);
- FixFileLinks();
}
#endregion ApplicationItem Overloads
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs 2007-09-24 13:59:44 UTC (rev 954)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Items/ApplicationItemMame.cs 2007-09-24 19:20:56 UTC (rev 955)
@@ -105,7 +105,6 @@
{
DeleteFiles();
Import(bGUIMode);
- FixFileLinks();
}
protected override void Import(bool mpGUIMode)
@@ -115,7 +114,6 @@
{
ShowProgressDialog("Importing from mame..");
}
-
importBase = new MameImport(this);
base.Import(mpGUIMode);
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs 2007-09-24 13:59:44 UTC (rev 954)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs 2007-09-24 19:20:56 UTC (rev 955)
@@ -314,53 +314,49 @@
GUIProgramsAlt.ThumbnailPath = "";
}
- static public string GetAvailableExtensions(string curDirectory)
+ static public void GetAvailableExtensions(string curDirectory,List<string> extensionList)
{
char separator = ';';
string[] fileDirs = curDirectory.Split(separator);
- List<string> extensionsList = new List<string>();
string extension = "";
- string result = "";
foreach (string dir in fileDirs)
{
+
if (System.IO.Directory.Exists(dir))
{
string[] fileEntries = System.IO.Directory.GetFiles(dir);
if ((fileEntries != null) && (fileEntries.Length > 0))
{
-
-
- foreach (string fileName in fileEntries)
+ foreach (string fileName in fileEntries)
{
extension = System.IO.Path.GetExtension(fileName).ToLower();
if (extension.Trim() == "")
{
extension = "."; // placeholder for "files without any extension
}
- if (!extensionsList.Contains(extension))
+ if (!extensionList.Contains(extension))
{
- extensionsList.Add(extension);
+ extensionList.Add(extension);
}
}
}
+ //check if underdirs
+ string[] directorys = Directory.GetDirectories(dir);
+ if ((directorys != null) && (directorys.Length > 0))
+ {
+ foreach (string dirName in directorys)
+ {
+ GetAvailableExtensions(dirName,extensionList);
+ }
+ }
+
}
}
- foreach (string ext in extensionsList)
- {
- if (result == "")
- {
- result += ext;
- }
- else
- {
- result += separator + ext;
- }
- }
+
- return result;
}
public class ListItem
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
