claunia/RomVault
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from jwestfall69/master

Browse Source 
Couple bug fixes for mono/linux, additional cleanup from file renames
This commit is contained in:
gjefferyes
2014-10-24 08:43:38 -05:00
parent be346c3485 47bf98faf0
commit 0801ddc7f0
11 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ROMVault2/DatMaker.cs
View File

@@ -27,7 +27,6 @@ namespace ROMVault2
_sw.Close();
Console.WriteLine("Dat creation complete");
Console.ReadLine();
}
private static void WriteDatFile(RvDir dir)

10
ROMVault2/FrmHelpAbout.Designer.cs generated
View File

@@ -1,6 +1,6 @@
namespace ROMVault2
{
partial class frmHelpAbout
partial class FrmHelpAbout
{
/// <summary>
/// Required designer variable.
@@ -67,7 +67,7 @@
this.label2.Text = "support@romvault.com";
this.label2.Click += new System.EventHandler(this.label2_Click);
//
// frmHelpAbout
// FrmHelpAbout
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -79,10 +79,10 @@
this.Controls.Add(this.lblVersion);
this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Name = "frmHelpAbout";
this.Name = "FrmHelpAbout";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "frmHelpAbout";
this.Text = "FrmHelpAbout";
this.ResumeLayout(false);
this.PerformLayout();
@@ -94,4 +94,4 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
}
}
}

4
ROMVault2/FrmHelpAbout.cs
View File

@@ -9,9 +9,9 @@ using System.Windows.Forms;
namespace ROMVault2
{
public partial class frmHelpAbout : Form
public partial class FrmHelpAbout : Form
{
public frmHelpAbout()
public FrmHelpAbout()
{
InitializeComponent();

12
ROMVault2/FrmKey.Designer.cs generated
View File

@@ -1,6 +1,6 @@
namespace ROMVault2
{
partial class frmKey
partial class FrmKey
{
/// <summary>
/// Required designer variable.
@@ -28,10 +28,10 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmKey));
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmKey));
this.SuspendLayout();
//
// frmKey
// FrmKey
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -39,10 +39,10 @@
this.ClientSize = new System.Drawing.Size(600, 532);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmKey";
this.Name = "FrmKey";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Color Key to ROM Status";
this.Load += new System.EventHandler(this.frmKey_Load);
this.Load += new System.EventHandler(this.FrmKey_Load);
this.ResumeLayout(false);
}
@@ -52,4 +52,4 @@
}
}
}

6
ROMVault2/FrmKey.cs
View File

@@ -11,14 +11,14 @@ using System.Windows.Forms;
namespace ROMVault2
{
public partial class frmKey : Form
public partial class FrmKey : Form
{
public frmKey()
public FrmKey()
{
InitializeComponent();
}
private void frmKey_Load(object sender, EventArgs e)
private void FrmKey_Load(object sender, EventArgs e)
{
List<RepStatus> displayList= new List<RepStatus>
{

10
ROMVault2/FrmMain.cs
View File

@@ -1,4 +1,4 @@
/******************************************************
/******************************************************
* ROMVault2 is written by Gordon J. *
* Contact gordon@romvault.com *
* Copyright 2010 *
@@ -40,7 +40,7 @@ namespace ROMVault2
public static int[] GameGridColumnXPositions;
private frmKey _fk;
private FrmKey _fk;
private Single _scaleFactorX = 1;
private Single _scaleFactorY = 1;
@@ -1201,7 +1201,7 @@ namespace ROMVault2
{
if (_fk == null || _fk.IsDisposed)
_fk = new frmKey();
_fk = new FrmKey();
_fk.Show();
}
@@ -1215,7 +1215,7 @@ namespace ROMVault2
private void BtnReportClick(object sender, EventArgs e)
{
Report.MakeFixFiles();
//frmReport newreporter = new frmReport();
//FrmReport newreporter = new FrmReport();
//newreporter.ShowDialog();
//newreporter.Dispose();
}
@@ -1236,7 +1236,7 @@ namespace ROMVault2
private void AboutRomVaultToolStripMenuItemClick(object sender, EventArgs e)
{
frmHelpAbout fha = new frmHelpAbout();
FrmHelpAbout fha = new FrmHelpAbout();
fha.ShowDialog(this);
fha.Dispose();
}

10
ROMVault2/FrmShowError.Designer.cs generated
View File

@@ -1,6 +1,6 @@
namespace ROMVault2
{
partial class frmShowError
partial class FrmShowError
{
/// <summary>
/// Required designer variable.
@@ -28,7 +28,7 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmShowError));
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmShowError));
this.textBox1 = new System.Windows.Forms.TextBox();
this.button1 = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
@@ -62,7 +62,7 @@
this.label1.TabIndex = 2;
this.label1.Text = "Sending Error Message to RomVault.Com";
//
// frmShowError
// FrmShowError
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -72,7 +72,7 @@
this.Controls.Add(this.textBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmShowError";
this.Name = "FrmShowError";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "RomVault Error report";
this.ResumeLayout(false);
@@ -86,4 +86,4 @@
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Label label1;
}
}
}

4
ROMVault2/FrmShowError.cs
View File

@@ -9,9 +9,9 @@ using System.Windows.Forms;
namespace ROMVault2
{
public partial class frmShowError : Form
public partial class FrmShowError : Form
{
public frmShowError()
public FrmShowError()
{
InitializeComponent();
}

4
ROMVault2/FrmSplashScreen.Designer.cs generated
View File

@@ -100,7 +100,7 @@
this.Name = "FrmSplashScreen";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "frmSplashScreen";
this.Text = "FrmSplashScreen";
this.Shown += new System.EventHandler(this.FrmSplashScreenShown);
this.ResumeLayout(false);
this.PerformLayout();
@@ -116,4 +116,4 @@
private System.ComponentModel.BackgroundWorker bgWork;
private System.Windows.Forms.Label label1;
}
}
}

6
ROMVault2/IO/RVIO.cs
View File

@@ -60,6 +60,9 @@ namespace ROMVault2.IO
if (Settings.MonoFileIO)
{
System.IO.FileInfo fi = new System.IO.FileInfo(path);
if(!fi.Exists) return;
Length = fi.Length;
LastWriteTime = fi.LastWriteTimeUtc.Ticks;
return;
@@ -94,6 +97,9 @@ namespace ROMVault2.IO
if (Settings.MonoFileIO)
{
System.IO.DirectoryInfo fi = new System.IO.DirectoryInfo(path);
if(!fi.Exists) return;
LastWriteTime = fi.LastWriteTimeUtc.Ticks;
return;
}

8
ROMVault2/ReportError.cs
View File

@@ -34,7 +34,7 @@ namespace ROMVault2
SendErrorMessage(message);
frmShowError fshow = new frmShowError();
FrmShowError fshow = new FrmShowError();
fshow.settype(message);
fshow.ShowDialog();
@@ -60,7 +60,7 @@ namespace ROMVault2
SendErrorMessage(message);
frmShowError fshow = new frmShowError();
FrmShowError fshow = new FrmShowError();
fshow.settype(message);
fshow.ShowDialog();
@@ -82,7 +82,7 @@ namespace ROMVault2
SendErrorMessage(message);
frmShowError fshow = new frmShowError();
FrmShowError fshow = new FrmShowError();
fshow.settype(message);
fshow.ShowDialog();
@@ -225,4 +225,4 @@ namespace ROMVault2
sw.Close();
}
}
}
}