From: <che...@us...> - 2007-06-17 10:43:30
|
Revision: 562 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=562&view=rev Author: chef_koch Date: 2007-06-17 03:43:10 -0700 (Sun, 17 Jun 2007) Log Message: ----------- renamed some objects 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-17 10:32:26 UTC (rev 561) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ApplicationItems/ApplicationItem.cs 2007-06-17 10:43:10 UTC (rev 562) @@ -103,6 +103,11 @@ #region Properties // Helper Routines + public SQLiteClient db + { + get { return sqlDB; } + } + public int AppID { get { return appID; } @@ -294,10 +299,6 @@ } - public SQLiteClient db - { - get { return sqlDB; } - } public int CurrentSortIndex { get { return GetCurrentSortIndex(); } @@ -410,26 +411,20 @@ return (FileItem)Files[index]; } - public virtual void LaunchFile(GUIListItem item) + public virtual void LaunchFile(GUIListItem guiListItem) { // Launch File by GUILISTITEM // => look for FileItem and launch it using the found object - if (item.MusicTag == null) - { - return; - } - FileItem curFile = (FileItem)item.MusicTag; + if (guiListItem.MusicTag == null) return; + FileItem curFileItem = (FileItem)guiListItem.MusicTag; + if (curFileItem == null) return; - if (curFile == null) - { - return; - } - this.LaunchFile(curFile, true); + this.LaunchFile(curFileItem, true); } - public virtual void LaunchFile(FileItem curFile, bool mpGuiMode) + public virtual void LaunchFile(FileItem curFileItem, bool mpGuiMode) { - string curFilename = curFile.Filename; + string curFilename = curFileItem.Filename; if (curFilename == "") { return; @@ -438,7 +433,7 @@ // Launch File by item if (mpGuiMode) { - curFile.UpdateLaunchInfo(); + curFileItem.UpdateLaunchInfo(); } ProcessStartInfo procStart = new ProcessStartInfo(); @@ -451,7 +446,7 @@ if (UseQuotes) { // avoid double quotes around the filename-argument..... - curFilename = "\"" + (curFile.Filename.TrimStart('\"')).TrimEnd('\"') + "\""; + curFilename = "\"" + (curFileItem.Filename.TrimStart('\"')).TrimEnd('\"') + "\""; } if (procStart.Arguments.IndexOf("%FILEnoPATHnoEXT%") >= 0) @@ -459,7 +454,7 @@ // ex. kawaks: // winkawaks.exe alpham2 // => filename without path and extension is necessary! - string filenameNoPathNoExt = curFile.ExtractFileName(); + string filenameNoPathNoExt = curFileItem.ExtractFileName(); filenameNoPathNoExt = (filenameNoPathNoExt.TrimStart('\"')).TrimEnd('\"'); filenameNoPathNoExt = Path.GetFileNameWithoutExtension(filenameNoPathNoExt); procStart.Arguments = procStart.Arguments.Replace("%FILEnoPATHnoEXT%", filenameNoPathNoExt); @@ -481,7 +476,7 @@ procStart.WorkingDirectory = StartupDir; if (procStart.WorkingDirectory.IndexOf("%FILEDIR%") != -1) { - procStart.WorkingDirectory = procStart.WorkingDirectory.Replace("%FILEDIR%", Path.GetDirectoryName(curFile.Filename)); + procStart.WorkingDirectory = procStart.WorkingDirectory.Replace("%FILEDIR%", Path.GetDirectoryName(curFileItem.Filename)); } procStart.UseShellExecute = UseShellExecute; } @@ -489,15 +484,15 @@ { // application has no launch-file // => try to make a correct launch using the current FILE object - procStart.FileName = curFile.Filename; - procStart.WorkingDirectory = Path.GetFullPath(curFile.Filename); + procStart.FileName = curFileItem.Filename; + procStart.WorkingDirectory = Path.GetFullPath(curFileItem.Filename); if (StartupDir != "") { if (StartupDir.Contains("%FILEDIR%")) { - procStart.WorkingDirectory = procStart.WorkingDirectory.Replace("%FILEDIR%", Path.GetDirectoryName(curFile.Filename)); + procStart.WorkingDirectory = procStart.WorkingDirectory.Replace("%FILEDIR%", Path.GetDirectoryName(curFileItem.Filename)); } else { @@ -542,12 +537,12 @@ catch (Exception ex) { string ErrorString = String.Format("myPrograms: error launching program\n filename: {0}\n arguments: {1}\n WorkingDirectory: {2}\n stack: {3} {4} {5}", - procStart.FileName, - procStart.Arguments, - procStart.WorkingDirectory, - ex.Message, - ex.Source, - ex.StackTrace); + procStart.FileName, + procStart.Arguments, + procStart.WorkingDirectory, + ex.Message, + ex.Source, + ex.StackTrace); Log.Info(ErrorString); this.LaunchErrorMsg = ErrorString; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |