diff --git a/ROMVault2/FrmMain.cs b/ROMVault2/FrmMain.cs index ba6c53f..50ce71c 100644 --- a/ROMVault2/FrmMain.cs +++ b/ROMVault2/FrmMain.cs @@ -444,6 +444,15 @@ namespace ROMVault2 private void DatSetSelected(RvBase cf) { DirTree.Refresh(); + + if (Settings.IsMono) + { + if (GameGrid.RowCount > 0) + GameGrid.CurrentCell = GameGrid[0,0]; + if (RomGrid.RowCount > 0) + RomGrid.CurrentCell = RomGrid[0,0]; + } + GameGrid.Rows.Clear(); RomGrid.Rows.Clear(); @@ -579,6 +588,15 @@ namespace ROMVault2 lblDITRomsUnknown.Text = (tDir.DirStatus.CountUnknown() + tDir.DirStatus.CountInToSort()).ToString(CultureInfo.InvariantCulture); _updatingGameGrid = true; + + if (Settings.IsMono) + { + if (GameGrid.RowCount > 0) + GameGrid.CurrentCell = GameGrid[0,0]; + if (RomGrid.RowCount > 0) + RomGrid.CurrentCell = RomGrid[0,0]; + } + GameGrid.Rows.Clear(); RomGrid.Rows.Clear(); @@ -1160,6 +1178,9 @@ namespace ROMVault2 } } + if (Settings.IsMono && RomGrid.RowCount > 0) + RomGrid.CurrentCell = RomGrid[0,0]; + RomGrid.Rows.Clear(); AddDir(tGame, ""); GC.Collect(); diff --git a/ROMVault2/FrmSetDir.cs b/ROMVault2/FrmSetDir.cs index fa07d0f..27512e6 100644 --- a/ROMVault2/FrmSetDir.cs +++ b/ROMVault2/FrmSetDir.cs @@ -35,6 +35,9 @@ namespace ROMVault2 private void UpdateGrid() { + if (Settings.IsMono && DataGridGames.RowCount > 0) + DataGridGames.CurrentCell = DataGridGames[0,0]; + DataGridGames.Rows.Clear(); foreach (DirMap t in Settings.DirPathMap) { diff --git a/ROMVault2/IO/RVIO.cs b/ROMVault2/IO/RVIO.cs index 476ad7a..6539b24 100644 --- a/ROMVault2/IO/RVIO.cs +++ b/ROMVault2/IO/RVIO.cs @@ -57,7 +57,7 @@ namespace ROMVault2.IO FullName = path; Name = Path.GetFileName(path); - if (Settings.MonoFileIO) + if (Settings.IsUnix) { System.IO.FileInfo fi = new System.IO.FileInfo(path); @@ -94,7 +94,7 @@ namespace ROMVault2.IO FullName = path; Name = Path.GetFileName(path); - if (Settings.MonoFileIO) + if (Settings.IsUnix) { System.IO.DirectoryInfo fi = new System.IO.DirectoryInfo(path); @@ -123,7 +123,7 @@ namespace ROMVault2.IO { List dirs = new List(); - if (Settings.MonoFileIO) + if (Settings.IsUnix) { System.IO.DirectoryInfo di = new System.IO.DirectoryInfo(FullName); System.IO.DirectoryInfo[] arrDi = di.GetDirectories(SearchPattern); @@ -183,7 +183,7 @@ namespace ROMVault2.IO { List files = new List(); - if (Settings.MonoFileIO) + if (Settings.IsUnix) { System.IO.DirectoryInfo di = new System.IO.DirectoryInfo(FullName); System.IO.FileInfo[] arrDi = di.GetFiles(SearchPattern); @@ -239,7 +239,7 @@ namespace ROMVault2.IO { public static bool Exists(string path) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) return System.IO.Directory.Exists(path); @@ -252,7 +252,7 @@ namespace ROMVault2.IO } public static void Move(String sourceDirName, String destDirName) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) { System.IO.Directory.Move(sourceDirName, destDirName); return; @@ -288,7 +288,7 @@ namespace ROMVault2.IO } public static void Delete(String path) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) { System.IO.Directory.Delete(path); return; @@ -301,7 +301,7 @@ namespace ROMVault2.IO public static void CreateDirectory(String path) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) { System.IO.Directory.CreateDirectory(path); return; @@ -323,7 +323,7 @@ namespace ROMVault2.IO { public static bool Exists(string path) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) return System.IO.File.Exists(path); @@ -340,7 +340,7 @@ namespace ROMVault2.IO } public static void Copy(String sourceFileName, String destFileName, bool overwrite) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) { System.IO.File.Copy(sourceFileName, destFileName, overwrite); return; @@ -387,7 +387,7 @@ namespace ROMVault2.IO } public static void Move(String sourceFileName, String destFileName) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) { System.IO.File.Move(sourceFileName, destFileName); return; @@ -412,7 +412,7 @@ namespace ROMVault2.IO } public static void Delete(String path) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) { System.IO.File.Delete(path); return; @@ -431,7 +431,7 @@ namespace ROMVault2.IO public static bool SetAttributes(String path, FileAttributes fileAttributes) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) { try { @@ -466,7 +466,7 @@ namespace ROMVault2.IO } public static string Combine(string path1, string path2) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) return System.IO.Path.Combine(path1, path2); if (path1 == null || path2 == null) @@ -538,7 +538,7 @@ namespace ROMVault2.IO } public static String GetDirectoryName(String path) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) return System.IO.Path.GetDirectoryName(path); @@ -600,7 +600,7 @@ namespace ROMVault2.IO public static int OpenFileRead(string path, out System.IO.Stream stream) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) { try { @@ -634,7 +634,7 @@ namespace ROMVault2.IO public static int OpenFileWrite(string path, out System.IO.Stream stream) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) { try { @@ -675,7 +675,7 @@ namespace ROMVault2.IO { public static string GetShortPath(string path) { - if (Settings.MonoFileIO) + if (Settings.IsUnix) return path; int remove = 0; diff --git a/ROMVault2/Settings.cs b/ROMVault2/Settings.cs index 4efbc9a..5fbe7af 100644 --- a/ROMVault2/Settings.cs +++ b/ROMVault2/Settings.cs @@ -48,7 +48,7 @@ namespace ROMVault2 public static bool CacheSaveTimerEnabled = true; public static int CacheSaveTimePeriod = 10; - public static bool MonoFileIO + public static bool IsUnix { get { @@ -57,6 +57,8 @@ namespace ROMVault2 } } + public static bool IsMono { get { return (Type.GetType ("Mono.Runtime") != null); } } + public static string EMail { get diff --git a/ROMVault2/SupportedFiles/CHD/CHD.cs b/ROMVault2/SupportedFiles/CHD/CHD.cs index 412fe48..3d5ba2b 100644 --- a/ROMVault2/SupportedFiles/CHD/CHD.cs +++ b/ROMVault2/SupportedFiles/CHD/CHD.cs @@ -246,7 +246,7 @@ namespace ROMVault2.SupportedFiles.CHD _resultType = CHDManCheck.Unset; string chdExe = "chdman.exe"; - if (Settings.MonoFileIO) + if (Settings.IsUnix) chdExe = "chdman"; string chdPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, chdExe);