fixs spaces into tabs in a bunch of files because I'm tired of fixing it gradually

This commit is contained in:
andres.delikat 2011-06-19 23:39:25 +00:00
parent 38422fda10
commit 5bda595ee7
19 changed files with 2926 additions and 2914 deletions

View File

@ -107,6 +107,7 @@
this.Name = "ArchiveChooser"; this.Name = "ArchiveChooser";
this.ShowIcon = false; this.ShowIcon = false;
this.Text = "Choose File From Archive"; this.Text = "Choose File From Archive";
this.Load += new System.EventHandler(this.ArchiveChooser_Load);
this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

View File

@ -51,5 +51,10 @@ namespace BizHawk.MultiClient
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
Close(); Close();
} }
private void ArchiveChooser_Load(object sender, EventArgs e)
{
}
} }
} }

View File

@ -12,12 +12,12 @@ namespace BizHawk.MultiClient
try try
{ {
var file = new FileInfo(filepath); var file = new FileInfo(filepath);
if(file.Exists) if (file.Exists)
using (var reader = file.OpenText()) using (var reader = file.OpenText())
{ {
var s = new JsonSerializer(); var s = new JsonSerializer();
var r = new JsonReader(reader); var r = new JsonReader(reader);
config = (T) s.Deserialize(r, typeof (T)); config = (T)s.Deserialize(r, typeof(T));
} }
} }
catch { } catch { }

View File

@ -62,7 +62,7 @@ namespace BizHawk.MultiClient
/// <summary> /// <summary>
/// returns the complete canonical full path ("c:\path\to\archive|member") of the bound file /// returns the complete canonical full path ("c:\path\to\archive|member") of the bound file
/// </summary> /// </summary>
public string CanonicalFullPath { get { return MakeCanonicalName(rootPath,memberPath); } } public string CanonicalFullPath { get { return MakeCanonicalName(rootPath, memberPath); } }
/// <summary> /// <summary>
/// returns the complete canonical name ("archive|member") of the bound file /// returns the complete canonical name ("archive|member") of the bound file
@ -72,7 +72,7 @@ namespace BizHawk.MultiClient
/// <summary> /// <summary>
/// returns the virtual name of the bound file (disregarding the archive) /// returns the virtual name of the bound file (disregarding the archive)
/// </summary> /// </summary>
public string Name { get { return GetBoundNameFromCanonical(MakeCanonicalName(rootPath,memberPath)); } } public string Name { get { return GetBoundNameFromCanonical(MakeCanonicalName(rootPath, memberPath)); } }
/// <summary> /// <summary>
/// returns the extension of Name /// returns the extension of Name

View File

@ -7,8 +7,8 @@ namespace BizHawk.MultiClient
public class Controller : IController public class Controller : IController
{ {
private ControllerDefinition type; private ControllerDefinition type;
private Dictionary<string,List<string>> bindings = new Dictionary<string, List<string>>(); private Dictionary<string, List<string>> bindings = new Dictionary<string, List<string>>();
private Dictionary<string,bool> stickyButtons = new Dictionary<string, bool>(); private Dictionary<string, bool> stickyButtons = new Dictionary<string, bool>();
private List<string> unpressedButtons = new List<string>(); private List<string> unpressedButtons = new List<string>();
private List<string> forcePressedButtons = new List<string>(); private List<string> forcePressedButtons = new List<string>();
private List<string> removeFromForcePressedButtons = new List<string>(); private List<string> removeFromForcePressedButtons = new List<string>();
@ -237,14 +237,14 @@ namespace BizHawk.MultiClient
input.Append(IsPressed("UP") ? "U" : "."); input.Append(IsPressed("UP") ? "U" : ".");
input.Append(IsPressed("DOWN") ? "D" : "."); input.Append(IsPressed("DOWN") ? "D" : ".");
input.Append(IsPressed("LEFT") ? "L" : "."); input.Append(IsPressed("LEFT") ? "L" : ".");
input.Append(IsPressed("RIGHT") ? "R": "."); input.Append(IsPressed("RIGHT") ? "R" : ".");
input.Append(IsPressed("PLUS") ? "+": "."); input.Append(IsPressed("PLUS") ? "+" : ".");
input.Append(IsPressed("MINUS") ? "_": "."); input.Append(IsPressed("MINUS") ? "_" : ".");
input.Append(IsPressed("MULTIPLY") ? "*": "."); input.Append(IsPressed("MULTIPLY") ? "*" : ".");
input.Append(IsPressed("DIVIDE") ? "/": "."); input.Append(IsPressed("DIVIDE") ? "/" : ".");
input.Append(IsPressed("CLEAR") ? "c": "."); input.Append(IsPressed("CLEAR") ? "c" : ".");
input.Append(IsPressed("EXP") ? "^": "."); input.Append(IsPressed("EXP") ? "^" : ".");
input.Append(IsPressed("DASH") ? "-": "."); input.Append(IsPressed("DASH") ? "-" : ".");
input.Append(IsPressed("PARAOPEN") ? "(" : "."); input.Append(IsPressed("PARAOPEN") ? "(" : ".");
input.Append(IsPressed("PARACLOSE") ? ")" : "."); input.Append(IsPressed("PARACLOSE") ? ")" : ".");
input.Append(IsPressed("TAN") ? "T" : "."); input.Append(IsPressed("TAN") ? "T" : ".");

View File

@ -20,7 +20,7 @@ namespace BizHawk.MultiClient
public static bool IsPressed(string control) public static bool IsPressed(string control)
{ {
string[] controls = control.Split('+'); string[] controls = control.Split('+');
for (int i=0; i<controls.Length; i++) for (int i = 0; i < controls.Length; i++)
{ {
if (IsPressedSingle(controls[i]) == false) if (IsPressedSingle(controls[i]) == false)
return false; return false;
@ -45,7 +45,7 @@ namespace BizHawk.MultiClient
int x = 0; int x = 0;
x++; x++;
} }
Key k = (Key) Enum.Parse(typeof(Key), control, true); Key k = (Key)Enum.Parse(typeof(Key), control, true);
return KeyInput.IsPressed(k); return KeyInput.IsPressed(k);
} }

View File

@ -17,7 +17,8 @@ namespace BizHawk.MultiClient
Global.Config = ConfigService.Load<Config>(PathManager.DefaultIniPath); Global.Config = ConfigService.Load<Config>(PathManager.DefaultIniPath);
try { Global.DSound = new DirectSound(); } try { Global.DSound = new DirectSound(); }
catch { catch
{
MessageBox.Show("Couldn't initialize DirectSound!"); MessageBox.Show("Couldn't initialize DirectSound!");
return; return;
} }
@ -29,7 +30,8 @@ namespace BizHawk.MultiClient
Global.Config.ForceGDI = true; Global.Config.ForceGDI = true;
} }
try { try
{
if (Global.Config.SingleInstanceMode) if (Global.Config.SingleInstanceMode)
{ {
SingleInstanceController controller = new SingleInstanceController(args); SingleInstanceController controller = new SingleInstanceController(args);
@ -41,9 +43,13 @@ namespace BizHawk.MultiClient
mf.Show(); mf.Show();
mf.ProgramRunLoop(); mf.ProgramRunLoop();
} }
} catch (Exception e) { }
catch (Exception e)
{
MessageBox.Show(e.ToString(), "Oh, no, a terrible thing happened!\n\n" + e.ToString()); MessageBox.Show(e.ToString(), "Oh, no, a terrible thing happened!\n\n" + e.ToString());
} finally { }
finally
{
if (Global.DSound != null && Global.DSound.Disposed == false) if (Global.DSound != null && Global.DSound.Disposed == false)
Global.DSound.Dispose(); Global.DSound.Dispose();
if (Global.Direct3D != null && Global.Direct3D.Disposed == false) if (Global.Direct3D != null && Global.Direct3D.Disposed == false)

View File

@ -8,7 +8,7 @@ namespace BizHawk.MultiClient
private int MAX_RECENT_FILES; //Maximum number of files private int MAX_RECENT_FILES; //Maximum number of files
private List<string> recentlist; //List of recent files private List<string> recentlist; //List of recent files
public RecentFiles() : this(8) {} public RecentFiles() : this(8) { }
public RecentFiles(int max) public RecentFiles(int max)
{ {
recentlist = new List<string>(); recentlist = new List<string>();
@ -44,7 +44,7 @@ namespace BizHawk.MultiClient
} }
recentlist.Insert(0, newFile); recentlist.Insert(0, newFile);
if (recentlist.Count > MAX_RECENT_FILES) if (recentlist.Count > MAX_RECENT_FILES)
recentlist.Remove(recentlist[recentlist.Count-1]); recentlist.Remove(recentlist[recentlist.Count - 1]);
} }
public bool Remove(string newFile) public bool Remove(string newFile)

View File

@ -150,7 +150,7 @@ namespace BizHawk.MultiClient
Global.Config.PathPCESavestates = PCESavestatesBox.Text; Global.Config.PathPCESavestates = PCESavestatesBox.Text;
Global.Config.PathPCESaveRAM = PCESaveRAMBox.Text; Global.Config.PathPCESaveRAM = PCESaveRAMBox.Text;
Global.Config.PathPCEScreenshots = PCEScreenshotsBox.Text; Global.Config.PathPCEScreenshots = PCEScreenshotsBox.Text;
Global.Config.PathPCECheats =PCECheatsBox.Text; Global.Config.PathPCECheats = PCECheatsBox.Text;
Global.Config.BaseGenesis = GenesisBaseBox.Text; Global.Config.BaseGenesis = GenesisBaseBox.Text;
Global.Config.PathGenesisROMs = GenesisROMsBox.Text; Global.Config.PathGenesisROMs = GenesisROMsBox.Text;