From 8ecdc19d055d6792f4e2a926d98aa1ae7b32f070 Mon Sep 17 00:00:00 2001 From: Glought Date: Tue, 24 Apr 2012 00:16:18 -0700 Subject: [PATCH 1/4] Now each Instance has its own Login info. Great for people with multiple MC accounts. --- MultiMC/Main.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MultiMC/Main.cs b/MultiMC/Main.cs index c845510..d46b77a 100644 --- a/MultiMC/Main.cs +++ b/MultiMC/Main.cs @@ -1093,7 +1093,7 @@ private void ReadUserInfo(out string username, out string password) { try { - if (!File.Exists(Properties.Resources.LastLoginFileName)) + if (!File.Exists(Path.Combine(SelectedInst.RootDir, Properties.Resources.LastLoginFileName))) { username = password = ""; return; @@ -1117,7 +1117,7 @@ private void ReadUserInfo(out string username, out string password) ICryptoTransform decryptor = rijAlg.CreateDecryptor(key, IV); - using (FileStream fsDecrypt = File.OpenRead(Properties.Resources.LastLoginFileName)) + using (FileStream fsDecrypt = File.OpenRead(Path.Combine(SelectedInst.RootDir, Properties.Resources.LastLoginFileName))) { CryptoStream csDecrypt = new CryptoStream(fsDecrypt, decryptor, CryptoStreamMode.Read); @@ -1173,7 +1173,7 @@ private void WriteUserInfo(string username, string password) try { - using (FileStream fsEncrypt = File.Open(Properties.Resources.LastLoginFileName, + using (FileStream fsEncrypt = File.Open(Path.Combine(SelectedInst.RootDir, Properties.Resources.LastLoginFileName), FileMode.Create)) { using (CryptoStream csEncrypt = From 9939d6acc92fb66e4284a944fe320814be80a2d9 Mon Sep 17 00:00:00 2001 From: Glought Date: Sat, 28 Apr 2012 01:07:40 -0700 Subject: [PATCH 2/4] Added a way to copy Login Info from one Instance to another Instance. Signed-off-by: Glought --- MultiMC/GTKGUI/MainWindow.cs | 10 + MultiMC/GUI/IGUIManager.cs | 2 + MultiMC/GUI/IImportLoginInfoDialog.cs | 12 + MultiMC/Instance.cs | 27 + MultiMC/Main.cs | 48 +- MultiMC/MultiMC.csproj | 18 +- MultiMC/Properties/Resources.Designer.cs | 9 +- MultiMC/Properties/Resources.resx | 3 + MultiMC/Tasks/LoginCopyTask.cs | 78 ++ .../WinGUI/ImportLoginInfoForm.Designer.cs | 160 ++++ MultiMC/WinGUI/ImportLoginInfoForm.cs | 45 + MultiMC/WinGUI/ImportLoginInfoForm.resx | 216 +++++ MultiMC/WinGUI/MainForm.Designer.cs | 781 +++++++++--------- MultiMC/WinGUI/MainForm.cs | 10 +- .../WinGUI/ToolbarIcons/importexporticon.png | Bin 0 -> 1351 bytes MultiMC/WinGUI/WinFormsGUIManager.cs | 5 + 16 files changed, 1020 insertions(+), 404 deletions(-) create mode 100644 MultiMC/GUI/IImportLoginInfoDialog.cs create mode 100644 MultiMC/Tasks/LoginCopyTask.cs create mode 100644 MultiMC/WinGUI/ImportLoginInfoForm.Designer.cs create mode 100644 MultiMC/WinGUI/ImportLoginInfoForm.cs create mode 100644 MultiMC/WinGUI/ImportLoginInfoForm.resx create mode 100644 MultiMC/WinGUI/ToolbarIcons/importexporticon.png diff --git a/MultiMC/GTKGUI/MainWindow.cs b/MultiMC/GTKGUI/MainWindow.cs index 8c9e30c..6a86a7a 100644 --- a/MultiMC/GTKGUI/MainWindow.cs +++ b/MultiMC/GTKGUI/MainWindow.cs @@ -269,6 +269,11 @@ void OnCheckUpdatesClicked(object sender, EventArgs e) CheckUpdatesClicked(this, EventArgs.Empty); } + void OnImportInstLoginInfoClicked(object sender, EventArgs e) + { + if (ImportInstLoginInfoClicked != null) + ImportInstLoginInfoClicked(this, EventArgs.Empty); + } void OnHelpClicked(object sender, EventArgs e) { @@ -325,6 +330,7 @@ void OnViewInstFolderClicked(object sender, EventArgs e) ViewInstFolderClicked(this, new InstActionEventArgs(SelectedInst)); } + void OnDeleteClicked(object sender, EventArgs e) { if (DeleteInstClicked != null) @@ -422,6 +428,8 @@ public IList InstanceList public event EventHandler CheckUpdatesClicked; + public event EventHandler ImportInstLoginInfoClicked; + public event EventHandler HelpClicked; public event EventHandler AboutClicked; @@ -438,6 +446,8 @@ public IList InstanceList public event EventHandler ViewInstFolderClicked; + + public event EventHandler DeleteInstClicked; public event EventHandler RemoveOpenALClicked; diff --git a/MultiMC/GUI/IGUIManager.cs b/MultiMC/GUI/IGUIManager.cs index 9d5d7a8..d683518 100644 --- a/MultiMC/GUI/IGUIManager.cs +++ b/MultiMC/GUI/IGUIManager.cs @@ -32,6 +32,8 @@ public interface IGUIManager IEditModsDialog EditModsDialog(Instance inst); + IImportLoginInfoDialog ImportLoginInfoDialog(); + ILoginDialog LoginDialog(string errMsg = null); IDialog DeleteDialog(); diff --git a/MultiMC/GUI/IImportLoginInfoDialog.cs b/MultiMC/GUI/IImportLoginInfoDialog.cs new file mode 100644 index 0000000..b589302 --- /dev/null +++ b/MultiMC/GUI/IImportLoginInfoDialog.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace MultiMC.GUI +{ + public interface IImportLoginInfoDialog : IDialog + { + + } +} diff --git a/MultiMC/Instance.cs b/MultiMC/Instance.cs index 2525a79..8f7938d 100644 --- a/MultiMC/Instance.cs +++ b/MultiMC/Instance.cs @@ -79,6 +79,32 @@ public static Instance[] LoadInstances(string instDir) } return (Instance[])instList.ToArray(typeof(Instance)); } + public static String[] LoadInstancesNames(string instDir) + { + if (!Directory.Exists(instDir)) + { + return new String[0]; + } + + ArrayList instList = new ArrayList(); + foreach (string dir in Directory.GetDirectories(instDir)) + { + Console.WriteLine("Loading instance from " + dir + "..."); + Instance inst = null; + try + { + inst = LoadInstance(dir); + } + catch (InvalidInstanceException e) + { + Console.WriteLine(e.Message); + } + + if (inst != null) + instList.Add(inst.Name); + } + return (string[])instList.ToArray(typeof(string)); + } /// /// Loads the instance from the specified directory. @@ -376,6 +402,7 @@ public string RootDir } } + /// /// The directory where mods will be stored /// diff --git a/MultiMC/Main.cs b/MultiMC/Main.cs index d46b77a..b43997d 100644 --- a/MultiMC/Main.cs +++ b/MultiMC/Main.cs @@ -66,7 +66,7 @@ public Main() MainWindow.SettingsClicked += SettingsClicked; MainWindow.CheckUpdatesClicked += UpdateClicked; - + MainWindow.ImportInstLoginInfoClicked += ImportInstLoginInfoClicked; MainWindow.AboutClicked += AboutClicked; // Instance context menu @@ -79,7 +79,7 @@ public Main() MainWindow.EditModsClicked += EditModsClicked; MainWindow.RebuildJarClicked += RebuildClicked; MainWindow.ViewInstFolderClicked += ViewInstFolderClicked; - + MainWindow.DeleteInstClicked += DeleteInstClicked; // on linux, provide the possiblity to nuke OpenAL libs if(OSUtils.OS == OSEnum.Linux) @@ -348,8 +348,8 @@ void ViewFolderClicked(object sender, EventArgs e) { string instDir = Path.GetFullPath(AppSettings.Main.InstanceDir); - if (!Directory.Exists(instDir)) - Directory.CreateDirectory(instDir); + if (!Directory.Exists(instDir)) + Directory.CreateDirectory(instDir); Process.Start(instDir); } @@ -378,7 +378,26 @@ void SettingsClicked(object sender, EventArgs e) { DownloadNewVersion(); } + } + + void ImportInstLoginInfoClicked(object sender, EventArgs e) + { + IImportLoginInfoDialog importLoginInfoDlg = GUIManager.Main.ImportLoginInfoDialog(); + importLoginInfoDlg.ShowInTaskbar = false; + + importLoginInfoDlg.Response += (o, args) => + { + if (args.Response == DialogResponse.OK) + importLoginInfoDlg.Close(); + if (args.Response == DialogResponse.Cancel) + importLoginInfoDlg.Close(); + }; + + importLoginInfoDlg.Parent = MainWindow; + importLoginInfoDlg.DefaultPosition = DefWindowPosition.CenterParent; + importLoginInfoDlg.Run(); + } #endregion #region Instance Menu @@ -512,7 +531,10 @@ void ViewInstFolderClicked(object sender, InstActionEventArgs e) Process.Start(SelectedInst.RootDir); } - void DeleteInstClicked(object sender, InstActionEventArgs e) + + + + void DeleteInstClicked(object sender, InstActionEventArgs e) { IDialog deleteDialog = GUIManager.Main.DeleteDialog(); deleteDialog.ShowInTaskbar = false; @@ -1093,12 +1115,12 @@ private void ReadUserInfo(out string username, out string password) { try { - if (!File.Exists(Path.Combine(SelectedInst.RootDir, Properties.Resources.LastLoginFileName))) - { - username = password = ""; - return; - } + if (!File.Exists(Path.Combine(SelectedInst.RootDir, Properties.Resources.LastLoginFileName))) + { + username = password = ""; + return; + } using (SHA384 sha = SHA384.Create()) { byte[] hash = sha.ComputeHash( @@ -1117,7 +1139,7 @@ private void ReadUserInfo(out string username, out string password) ICryptoTransform decryptor = rijAlg.CreateDecryptor(key, IV); - using (FileStream fsDecrypt = File.OpenRead(Path.Combine(SelectedInst.RootDir, Properties.Resources.LastLoginFileName))) + using (FileStream fsDecrypt = File.OpenRead(Path.Combine(SelectedInst.RootDir, Properties.Resources.LastLoginFileName))) { CryptoStream csDecrypt = new CryptoStream(fsDecrypt, decryptor, CryptoStreamMode.Read); @@ -1173,7 +1195,9 @@ private void WriteUserInfo(string username, string password) try { - using (FileStream fsEncrypt = File.Open(Path.Combine(SelectedInst.RootDir, Properties.Resources.LastLoginFileName), + + + using (FileStream fsEncrypt = File.Open(Path.Combine(SelectedInst.RootDir, Properties.Resources.LastLoginFileName), FileMode.Create)) { using (CryptoStream csEncrypt = diff --git a/MultiMC/MultiMC.csproj b/MultiMC/MultiMC.csproj index 6fa0068..7fbe782 100644 --- a/MultiMC/MultiMC.csproj +++ b/MultiMC/MultiMC.csproj @@ -11,6 +11,7 @@ MultiMC MultiMC 512 + false publish\ true Disk @@ -23,7 +24,6 @@ true 0 1.0.0.%2a - false false true @@ -147,6 +147,7 @@ + @@ -179,6 +180,7 @@ + @@ -208,6 +210,12 @@ ConsoleForm.cs + + Form + + + ImportLoginInfoForm.cs + Form @@ -320,6 +328,9 @@ ConsoleForm.cs + + ImportLoginInfoForm.cs + TextInputDialog.cs @@ -443,6 +454,7 @@ + @@ -452,10 +464,10 @@ - "C:\Program Files\Java\jdk1.6.0_27\bin\javac" -d $(ProjectDir)Launcher $(ProjectDir)Launcher\MultiMCLauncher.java + "C:\Program Files\Java\jdk1.6.0_24\bin\javac" -d $(ProjectDir)Launcher $(ProjectDir)Launcher\MultiMCLauncher.java - copy $(TargetPath) C:\Users\Andrew\Dropbox\Public\MultiMC.exe + copy $(TargetPath) C:\visualstudio10\MultiMC.exe + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICAAP///wD///8A////ABsoOFoaJzfZGic5/yc5 + UJgVJT0U////AMDAwAD///8AAAAAAAAAAAAAAAAAAAAAAICAgAD///8ASFRidSQ3TfcUIC7/Hy5C/iAv + Qv4dKz/+ICk3/yAvQ7YgLkM5////AAAAAAAAAAAAAAAAAFBzoghIaZOZO1h8/yk8Vf8eLUL/HCo8/xon + OP8XIzL/Hy1A/iAuQv8cKTz+GSU3/yAvQ+QUHy1QAAAAAAAAAABHapQsOFN2/zZSdf9CX4T/OEhb/iIy + R/8mMD3/IDBF/yAuQv8lNk7/KDRF/yIxQ/8dLD/+IC9D3QAAAAAAAAAAN1J2Kz9ZfP8VGiL/AAAA/wkL + Df8lMD7/GSY4/x4sP/8iMUP/Exge/wQDAv4AAAD/HSMs/yg7VNsAAAAAAAAAAF+LwCoYHiX/RmGE/i9E + Yf8rOk3+BgcI/xYbIf4lM0f/ERQX/igyP/4dKTr/JzNE/wgJC/8eJC3bAAAAAAAAAABQXnAwHSUx/0ds + mv4/XYP+N1Fy/i9BWP4HCAn/CAkI/ig2Sf4fKjn+KTxV/xwqPP8fKDb/ERQY3wAAAAAAAAAAOD5FNiEq + Nv9VaoX9L0lq/h4sRv4jOUD+Gy4r/gIBAf4dIy39Fy0x/hMbK/4eLUL+KDZI/hASFOIAAAAAAAAAAGyM + tiwCAgD/PmFw/So7X/00ilb+PG1V/gwaEP4vZkX/AAAA/yE3Lv4TNSf+Dxgc+yEpNv4aISnbAAAAAAAA + AAAkPHIrOklP/wAAAP4aLST8GSwh/hIcFv9Ik2v/LHVK/ihcPP8BAAD+Eh4W/iVCMv4OExD+GSYy2gAA + AAAAAAAAZdSVK0WecP89i1/+K15B/zZ0UP9MnnL+Mn9S/y95Tv8pbkb/OXZV/yNHMv8mTjf+KGxD/hxO + M9oAAAAAAAAAAEWrbSNHrnD/Tqt3/zyZYf5FmGv/NIhV/zWCVf46f1r/MXNO/yJjO/4taEf/Jls8/iBU + N/8fWTbYAAAAAAAAAAAAAAAAgICAADKSWFM2kFynNI1X/zqKXv81gVX+OYBZ/ypvR/4sakf/IV056hpR + MIgqVD4mAAAAAAAAAAAAAAAAAAAAAICAgAD///8A////AP///wAzglRFLntOoCdxRM8na0KFK19EGICA + gACAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAgICAAICAgACAgIAAgICAAICAgACAgIAAgICAAICA + gACAgIAAAAAAAAAAAAAAAAAAAAAAAP//AAD+PwAA+A8AAMADAADAAQAAwAEAAMABAADAAQAAwAEAAMAB + AADAAQAAwAEAAMABAADwBwAA/j8AAP//AAAoAAAAIAAAAEAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAwMDAAMDAwADAwMAAwMDAAMDAwADAwMAAwMDAAMDA + wADAwMAAwMDAAMDAwADAwMAAERsnOcDAwADAwMAAwMDAAMDAwADAwMAAwMDAAMDAwADAwMAAwMDAAMDA + wADAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAgAD///8A////AP///wD///8A////AP// + /wD///8AwMDAAP///wD///8AHCo7VBQfLuQTHi3/HSo99Ck7VVz///8A////AP///wD///8AwMDAAP// + /wD///8A////AMDAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICAAP///wD///8A////AP// + /wD///8A////AP///wAAAwgFFiIwfB0rPPodKzz/HCo6/h8uQv4dKz3+JzlQ/yMzR/4gLkGFDhgpDP// + /wDAwMAA////AP///wD///8AwMDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAA////AP// + /wD///8A////AP///wAnOk8ZJztTmiQ2Tf8YJDT/FiIx/hcjMv4eLT//HSs8/h8uQf8RGyj+LEBa/x4s + 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 + If4XRy3/ERwo/iIkKvgeKDf+KC85/wAAAP82Q1OlAAAAAAAAAAAAAAAAAAAAAAAAAABKZYhpGyAl/wAA + AP4vO0b+MGdP/SU5Uv4fNkP9Pp1i/kmjb/9Sl3L+DxcS/wQGBP8uc0n+LXdK/zhrTP8DAwP/AAAA/wAA + AP8yUEL/Cg8W/iVlP/8NHBz+Ei4h/SEsO/0WGRz/FRcZ/zFDXaMAAAAAAAAAAAAAAAAAAAAAAAAAAEhs + mWlMXHD/AAAA/gAAAP4VHBn+N19O/DBRRf07eVP+NFBC/wQDA/8AAAD/RoNg/zuCXf80fFT/MnpO/zp0 + Uf8JCwn/AAAA/wAAAP8YIRv/NmJI/kWFYP5BaVb+HB8i/gAAAP8lLjv/GSY4owAAAAAAAAAAAAAAAAAA + AAAAAAAAHSpLajxFUP5MdGb+AAAA/gAAAP4AAAD+AAAA/gAAAP8AAAD+Ex0W/1CSbv9Hk2n/QYlj/ytz + Sv8mcET/IWc9/zFxS/8eLST/AAAA/wAAAP8AAAD/AwID/wAAAP8FAgT/KEs3/w4jHf4aJTejAAAAAAAA + AAAAAAAAAAAAAAAAAABdvY5pMGJT/1mziP5QlnT+KUg2/xgkHf8UHRj/IDgp/zRnSP9AkmP/RJFn/zaF + Vv8xfVL/LXdL/ydxRf8ka0H/N3dW/zp6V/8yXEP/KDgw/xsjH/8aJh//JkMx/y9pRv8gYDr+Hls2/QsN + HKMAAAAAAAAAAAAAAAAAAAAAAAAAAE2yd2lEsm7/Ta14/zaaX/85nGD/Oppg/0SebP82j1v/SJZw/1Oh + ev9Jl27/Oodc/zJ+Uv89iF3/LXVK/y92S/8hZjz/L29L/zZyUv8lYT7/KWVA/zJoSv8hXzn/JmhA/yRm + Pv8laED+H1M0owAAAAAAAAAAAAAAAAAAAAAAAAAASLBxaUmyc/9JrHP+Nplf/kGjZ/9Anmf/P5ll/0mc + cf88kWH/MohU/z6NYv83hFn/PoRg/0SIZf8ockX/M3VR/zN1T/8aXTT/I2I9/0SAYP8vZ0n/JFw6/yJW + OP8cUTP+IF04/xhZMv4naUGiAAAAAAAAAAAAAAAAAAAAAAAAAABFqm1IR69w8USrbv9ZtYT/W7OH/jqZ + X/4/m2T/RJpq/0OUaP87j1z/L4JP/zOEU/8wfk//OH9Z/0OFY/8ydk//KGxD/zN1Tf8kZD3/G1gz/yNc + O/8wZEj+Ilg5/ylYQP8fTzP/IE4z+SRcOnYAAAAAAAAAAAAAAAAAAAAAAAAAAICAgAD///8APpRhIz2e + ZHo4lV/kQJpp/zKOV/82kVn+NIxX/yt9UP5EkGn+RY9o/y57Tf8seEr/RYlm/yhvRf8obUP+K21F/y5r + SP8taEb+HVk1/h1VM/8bUTH2JFI4lC9YRTQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICAAP// + /wD///8A////AP///wA1jVYcLohReDSMWNs2jVn/PI9f/z2OXv41glb+LXxN/zqBW/8yeFH/Km9G/jV2 + Uv4xcE3/J2NC/x9bN+ocVTOJI1g2J4CAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AACAgIAA////AP///wD///8A////AP///wD///8A////ADuGWBM3iFdiNINWzTSDVP8wfVD/JXFD/ily + Rf8mbUL/J2pB6StoRXYrWkUjgICAAMDAwACAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAICAgAD///8A////AP///wD///8A////AP///wD///8AwMDAAP///wD///8AIWY+Ex5p + PWIqdEeeMnZOb0d9ZCX///8A////AP///wCAgIAAgICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAgICAAP///wD///8A////AP///wD///8A////AP///wDAwMAA////AP// + /wD///8A////AP///wDAwMAA////AP///wD///8A////AICAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIAAgICAAICAgACAgIAAgICAAICAgACAgIAAgICAAICA + gACAgIAAgICAAICAgACAgIAAgICAAICAgACAgIAAgICAAICAgACAgIAAgICAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////4////4B///wAH//wAAf/wAAB/wAAAH8AAAA/AA + AAPwAAAD8AAAA/AAAAPwAAAD8AAAA/AAAAPwAAAD8AAAA/AAAAPwAAAD8AAAA/AAAAPwAAAD8AAAA/AA + AAPwAAAH/gAAH//AAP//+A////9///////////// + + + \ No newline at end of file diff --git a/MultiMC/WinGUI/MainForm.Designer.cs b/MultiMC/WinGUI/MainForm.Designer.cs index c34ff5b..83f3b71 100644 --- a/MultiMC/WinGUI/MainForm.Designer.cs +++ b/MultiMC/WinGUI/MainForm.Designer.cs @@ -1,77 +1,78 @@ namespace MultiMC.WinGUI { - partial class MainForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class MainForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - this.instanceContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.playToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.renameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.changeIconToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editNotesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.manageSavesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editModsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.rebuildJarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.viewFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.menuToolBar = new System.Windows.Forms.ToolStrip(); - this.addInstButton = new System.Windows.Forms.ToolStripSplitButton(); - this.addNewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.copyExistingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.importButton = new System.Windows.Forms.ToolStripButton(); - this.viewInstanceFolder = new System.Windows.Forms.ToolStripButton(); - this.refreshButton = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.settingsButton = new System.Windows.Forms.ToolStripButton(); - this.checkUpdateButton = new System.Windows.Forms.ToolStripButton(); - this.aboutButton = new System.Windows.Forms.ToolStripButton(); - this.helpButton = new System.Windows.Forms.ToolStripButton(); - this.instView = new System.Windows.Forms.ListView(); - this.toolStripContainer = new System.Windows.Forms.ToolStripContainer(); - this.statusStrip1 = new System.Windows.Forms.StatusStrip(); - this.DragDropHintLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.instanceContextMenu.SuspendLayout(); - this.menuToolBar.SuspendLayout(); - this.toolStripContainer.BottomToolStripPanel.SuspendLayout(); - this.toolStripContainer.ContentPanel.SuspendLayout(); - this.toolStripContainer.TopToolStripPanel.SuspendLayout(); - this.toolStripContainer.SuspendLayout(); - this.statusStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // instanceContextMenu - // - this.instanceContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); + this.instanceContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.playToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.renameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.changeIconToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editNotesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.manageSavesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editModsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rebuildJarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.viewFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuToolBar = new System.Windows.Forms.ToolStrip(); + this.addInstButton = new System.Windows.Forms.ToolStripSplitButton(); + this.addNewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.copyExistingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importButton = new System.Windows.Forms.ToolStripButton(); + this.viewInstanceFolder = new System.Windows.Forms.ToolStripButton(); + this.refreshButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.settingsButton = new System.Windows.Forms.ToolStripButton(); + this.checkUpdateButton = new System.Windows.Forms.ToolStripButton(); + this.aboutButton = new System.Windows.Forms.ToolStripButton(); + this.helpButton = new System.Windows.Forms.ToolStripButton(); + this.importLoginInfoButton = new System.Windows.Forms.ToolStripButton(); + this.instView = new System.Windows.Forms.ListView(); + this.toolStripContainer = new System.Windows.Forms.ToolStripContainer(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.DragDropHintLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.instanceContextMenu.SuspendLayout(); + this.menuToolBar.SuspendLayout(); + this.toolStripContainer.BottomToolStripPanel.SuspendLayout(); + this.toolStripContainer.ContentPanel.SuspendLayout(); + this.toolStripContainer.TopToolStripPanel.SuspendLayout(); + this.toolStripContainer.SuspendLayout(); + this.statusStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // instanceContextMenu + // + this.instanceContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.playToolStripMenuItem, this.toolStripSeparator2, this.renameToolStripMenuItem, @@ -84,95 +85,95 @@ private void InitializeComponent() this.viewFolderToolStripMenuItem, this.toolStripMenuItem2, this.deleteToolStripMenuItem}); - this.instanceContextMenu.Name = "instanceContextMenu"; - this.instanceContextMenu.Size = new System.Drawing.Size(150, 220); - this.instanceContextMenu.Text = "Instance Menu"; - this.instanceContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.instanceContextMenu_Opening); - // - // playToolStripMenuItem - // - this.playToolStripMenuItem.Name = "playToolStripMenuItem"; - this.playToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.playToolStripMenuItem.Text = "&Play"; - this.playToolStripMenuItem.Click += new System.EventHandler(this.playToolStripMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(146, 6); - // - // renameToolStripMenuItem - // - this.renameToolStripMenuItem.Name = "renameToolStripMenuItem"; - this.renameToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.renameToolStripMenuItem.Text = "&Rename"; - this.renameToolStripMenuItem.Click += new System.EventHandler(this.renameToolStripMenuItem_Click); - // - // changeIconToolStripMenuItem - // - this.changeIconToolStripMenuItem.Name = "changeIconToolStripMenuItem"; - this.changeIconToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.changeIconToolStripMenuItem.Text = "Change &Icon"; - this.changeIconToolStripMenuItem.Click += new System.EventHandler(this.changeIconToolStripMenuItem_Click); - // - // editNotesToolStripMenuItem - // - this.editNotesToolStripMenuItem.Name = "editNotesToolStripMenuItem"; - this.editNotesToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.editNotesToolStripMenuItem.Text = "Edit &Notes"; - this.editNotesToolStripMenuItem.Click += new System.EventHandler(this.editNotesToolStripMenuItem_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(146, 6); - // - // manageSavesToolStripMenuItem - // - this.manageSavesToolStripMenuItem.Name = "manageSavesToolStripMenuItem"; - this.manageSavesToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.manageSavesToolStripMenuItem.Text = "Manage &Saves"; - this.manageSavesToolStripMenuItem.Click += new System.EventHandler(this.manageSavesToolStripMenuItem_Click); - // - // editModsToolStripMenuItem - // - this.editModsToolStripMenuItem.Name = "editModsToolStripMenuItem"; - this.editModsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.editModsToolStripMenuItem.Text = "Edit &Mods"; - this.editModsToolStripMenuItem.Click += new System.EventHandler(this.editModsToolStripMenuItem_Click); - // - // rebuildJarToolStripMenuItem - // - this.rebuildJarToolStripMenuItem.Name = "rebuildJarToolStripMenuItem"; - this.rebuildJarToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.rebuildJarToolStripMenuItem.Text = "Rebuild &Jar"; - this.rebuildJarToolStripMenuItem.Click += new System.EventHandler(this.rebuildJarToolStripMenuItem_Click); - // - // viewFolderToolStripMenuItem - // - this.viewFolderToolStripMenuItem.Name = "viewFolderToolStripMenuItem"; - this.viewFolderToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.viewFolderToolStripMenuItem.Text = "View &Folder"; - this.viewFolderToolStripMenuItem.Click += new System.EventHandler(this.viewFolderToolStripMenuItem_Click); - // - // toolStripMenuItem2 - // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(146, 6); - // - // deleteToolStripMenuItem - // - this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.deleteToolStripMenuItem.Text = "&Delete"; - this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); - // - // menuToolBar - // - this.menuToolBar.AutoSize = false; - this.menuToolBar.Dock = System.Windows.Forms.DockStyle.None; - this.menuToolBar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.menuToolBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.instanceContextMenu.Name = "instanceContextMenu"; + this.instanceContextMenu.Size = new System.Drawing.Size(150, 220); + this.instanceContextMenu.Text = "Instance Menu"; + this.instanceContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.instanceContextMenu_Opening); + // + // playToolStripMenuItem + // + this.playToolStripMenuItem.Name = "playToolStripMenuItem"; + this.playToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.playToolStripMenuItem.Text = "&Play"; + this.playToolStripMenuItem.Click += new System.EventHandler(this.playToolStripMenuItem_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(146, 6); + // + // renameToolStripMenuItem + // + this.renameToolStripMenuItem.Name = "renameToolStripMenuItem"; + this.renameToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.renameToolStripMenuItem.Text = "&Rename"; + this.renameToolStripMenuItem.Click += new System.EventHandler(this.renameToolStripMenuItem_Click); + // + // changeIconToolStripMenuItem + // + this.changeIconToolStripMenuItem.Name = "changeIconToolStripMenuItem"; + this.changeIconToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.changeIconToolStripMenuItem.Text = "Change &Icon"; + this.changeIconToolStripMenuItem.Click += new System.EventHandler(this.changeIconToolStripMenuItem_Click); + // + // editNotesToolStripMenuItem + // + this.editNotesToolStripMenuItem.Name = "editNotesToolStripMenuItem"; + this.editNotesToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.editNotesToolStripMenuItem.Text = "Edit &Notes"; + this.editNotesToolStripMenuItem.Click += new System.EventHandler(this.editNotesToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(146, 6); + // + // manageSavesToolStripMenuItem + // + this.manageSavesToolStripMenuItem.Name = "manageSavesToolStripMenuItem"; + this.manageSavesToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.manageSavesToolStripMenuItem.Text = "Manage &Saves"; + this.manageSavesToolStripMenuItem.Click += new System.EventHandler(this.manageSavesToolStripMenuItem_Click); + // + // editModsToolStripMenuItem + // + this.editModsToolStripMenuItem.Name = "editModsToolStripMenuItem"; + this.editModsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.editModsToolStripMenuItem.Text = "Edit &Mods"; + this.editModsToolStripMenuItem.Click += new System.EventHandler(this.editModsToolStripMenuItem_Click); + // + // rebuildJarToolStripMenuItem + // + this.rebuildJarToolStripMenuItem.Name = "rebuildJarToolStripMenuItem"; + this.rebuildJarToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.rebuildJarToolStripMenuItem.Text = "Rebuild &Jar"; + this.rebuildJarToolStripMenuItem.Click += new System.EventHandler(this.rebuildJarToolStripMenuItem_Click); + // + // viewFolderToolStripMenuItem + // + this.viewFolderToolStripMenuItem.Name = "viewFolderToolStripMenuItem"; + this.viewFolderToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.viewFolderToolStripMenuItem.Text = "View &Folder"; + this.viewFolderToolStripMenuItem.Click += new System.EventHandler(this.viewFolderToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(146, 6); + // + // deleteToolStripMenuItem + // + this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.deleteToolStripMenuItem.Text = "&Delete"; + this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); + // + // menuToolBar + // + this.menuToolBar.AutoSize = false; + this.menuToolBar.Dock = System.Windows.Forms.DockStyle.None; + this.menuToolBar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.menuToolBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.addInstButton, this.importButton, this.viewInstanceFolder, @@ -181,237 +182,247 @@ private void InitializeComponent() this.settingsButton, this.checkUpdateButton, this.aboutButton, - this.helpButton}); - this.menuToolBar.Location = new System.Drawing.Point(0, 0); - this.menuToolBar.Name = "menuToolBar"; - this.menuToolBar.Size = new System.Drawing.Size(604, 25); - this.menuToolBar.Stretch = true; - this.menuToolBar.TabIndex = 2; - this.menuToolBar.Text = "Menu"; - // - // addInstButton - // - this.addInstButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.addInstButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.helpButton, + this.importLoginInfoButton}); + this.menuToolBar.Location = new System.Drawing.Point(0, 0); + this.menuToolBar.Name = "menuToolBar"; + this.menuToolBar.Size = new System.Drawing.Size(604, 25); + this.menuToolBar.Stretch = true; + this.menuToolBar.TabIndex = 2; + this.menuToolBar.Text = "Menu"; + // + // addInstButton + // + this.addInstButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.addInstButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.addNewToolStripMenuItem, this.copyExistingToolStripMenuItem, this.importToolStripMenuItem}); - this.addInstButton.Image = global::MultiMC.Properties.Resources.NewInstIcon; - this.addInstButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.addInstButton.Name = "addInstButton"; - this.addInstButton.Size = new System.Drawing.Size(32, 22); - this.addInstButton.Text = "Add an instance"; - this.addInstButton.ButtonClick += new System.EventHandler(this.addInstButton_ButtonClick); - // - // addNewToolStripMenuItem - // - this.addNewToolStripMenuItem.Name = "addNewToolStripMenuItem"; - this.addNewToolStripMenuItem.Size = new System.Drawing.Size(230, 22); - this.addNewToolStripMenuItem.Text = "Create a new instance"; - this.addNewToolStripMenuItem.Click += new System.EventHandler(this.addNewToolStripMenuItem_Click); - // - // copyExistingToolStripMenuItem - // - this.copyExistingToolStripMenuItem.Name = "copyExistingToolStripMenuItem"; - this.copyExistingToolStripMenuItem.Size = new System.Drawing.Size(230, 22); - this.copyExistingToolStripMenuItem.Text = "Copy an existing instance"; - this.copyExistingToolStripMenuItem.Click += new System.EventHandler(this.copyExistingToolStripMenuItem_Click); - // - // importToolStripMenuItem - // - this.importToolStripMenuItem.Name = "importToolStripMenuItem"; - this.importToolStripMenuItem.Size = new System.Drawing.Size(230, 22); - this.importToolStripMenuItem.Text = "Import an existing installation"; - this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click); - // - // importButton - // - this.importButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.importButton.Image = global::MultiMC.Properties.Resources.document_import; - this.importButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.importButton.Name = "importButton"; - this.importButton.Size = new System.Drawing.Size(23, 22); - this.importButton.Text = "Import existing minecraft folder."; - this.importButton.Visible = false; - // - // viewInstanceFolder - // - this.viewInstanceFolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.viewInstanceFolder.Image = global::MultiMC.Properties.Resources.ViewFolderIcon; - this.viewInstanceFolder.ImageTransparentColor = System.Drawing.Color.Magenta; - this.viewInstanceFolder.Name = "viewInstanceFolder"; - this.viewInstanceFolder.Size = new System.Drawing.Size(23, 22); - this.viewInstanceFolder.Text = "View instance folder"; - // - // refreshButton - // - this.refreshButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.refreshButton.Image = global::MultiMC.Properties.Resources.RefreshInstIcon; - this.refreshButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.refreshButton.Name = "refreshButton"; - this.refreshButton.Size = new System.Drawing.Size(23, 22); - this.refreshButton.Text = "Refresh"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); - // - // settingsButton - // - this.settingsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.settingsButton.Image = global::MultiMC.Properties.Resources.SettingsIcon; - this.settingsButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.settingsButton.Name = "settingsButton"; - this.settingsButton.Size = new System.Drawing.Size(23, 22); - this.settingsButton.Text = "Settings"; - // - // checkUpdateButton - // - this.checkUpdateButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.checkUpdateButton.Image = global::MultiMC.Properties.Resources.CheckUpdateIcon; - this.checkUpdateButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.checkUpdateButton.Name = "checkUpdateButton"; - this.checkUpdateButton.Size = new System.Drawing.Size(23, 22); - this.checkUpdateButton.Text = "Check for updates..."; - // - // aboutButton - // - this.aboutButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.aboutButton.Image = global::MultiMC.Properties.Resources.AboutIcon; - this.aboutButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.aboutButton.Name = "aboutButton"; - this.aboutButton.Size = new System.Drawing.Size(60, 22); - this.aboutButton.Text = "About"; - // - // helpButton - // - this.helpButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.helpButton.Enabled = false; - this.helpButton.Image = global::MultiMC.Properties.Resources.HelpIcon; - this.helpButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.helpButton.Name = "helpButton"; - this.helpButton.Size = new System.Drawing.Size(52, 22); - this.helpButton.Text = "Help"; - // - // instView - // - this.instView.Alignment = System.Windows.Forms.ListViewAlignment.SnapToGrid; - this.instView.AllowDrop = true; - this.instView.ContextMenuStrip = this.instanceContextMenu; - this.instView.Dock = System.Windows.Forms.DockStyle.Fill; - this.instView.LabelEdit = true; - this.instView.Location = new System.Drawing.Point(0, 0); - this.instView.MultiSelect = false; - this.instView.Name = "instView"; - this.instView.Size = new System.Drawing.Size(604, 314); - this.instView.TabIndex = 1; - this.instView.UseCompatibleStateImageBehavior = false; - this.instView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.instView_AfterLabelEdit); - this.instView.ItemActivate += new System.EventHandler(this.instView_ItemActivate); - this.instView.DragDrop += new System.Windows.Forms.DragEventHandler(this.instView_DragDrop); - this.instView.DragOver += new System.Windows.Forms.DragEventHandler(this.instView_DragOver); - this.instView.DragLeave += new System.EventHandler(this.instView_DragLeave); - this.instView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.instView_KeyDown); - // - // toolStripContainer - // - // - // toolStripContainer.BottomToolStripPanel - // - this.toolStripContainer.BottomToolStripPanel.Controls.Add(this.statusStrip1); - // - // toolStripContainer.ContentPanel - // - this.toolStripContainer.ContentPanel.AutoScroll = true; - this.toolStripContainer.ContentPanel.Controls.Add(this.instView); - this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(604, 314); - this.toolStripContainer.Dock = System.Windows.Forms.DockStyle.Fill; - this.toolStripContainer.Location = new System.Drawing.Point(0, 0); - this.toolStripContainer.Name = "toolStripContainer"; - this.toolStripContainer.Size = new System.Drawing.Size(604, 361); - this.toolStripContainer.TabIndex = 3; - this.toolStripContainer.Text = "toolStripContainer1"; - // - // toolStripContainer.TopToolStripPanel - // - this.toolStripContainer.TopToolStripPanel.Controls.Add(this.menuToolBar); - // - // statusStrip1 - // - this.statusStrip1.Dock = System.Windows.Forms.DockStyle.None; - this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.addInstButton.Image = global::MultiMC.Properties.Resources.NewInstIcon; + this.addInstButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.addInstButton.Name = "addInstButton"; + this.addInstButton.Size = new System.Drawing.Size(32, 22); + this.addInstButton.Text = "Add an instance"; + this.addInstButton.ButtonClick += new System.EventHandler(this.addInstButton_ButtonClick); + // + // addNewToolStripMenuItem + // + this.addNewToolStripMenuItem.Name = "addNewToolStripMenuItem"; + this.addNewToolStripMenuItem.Size = new System.Drawing.Size(226, 22); + this.addNewToolStripMenuItem.Text = "Create a new instance"; + this.addNewToolStripMenuItem.Click += new System.EventHandler(this.addNewToolStripMenuItem_Click); + // + // copyExistingToolStripMenuItem + // + this.copyExistingToolStripMenuItem.Name = "copyExistingToolStripMenuItem"; + this.copyExistingToolStripMenuItem.Size = new System.Drawing.Size(226, 22); + this.copyExistingToolStripMenuItem.Text = "Copy an existing instance"; + this.copyExistingToolStripMenuItem.Click += new System.EventHandler(this.copyExistingToolStripMenuItem_Click); + // + // importToolStripMenuItem + // + this.importToolStripMenuItem.Name = "importToolStripMenuItem"; + this.importToolStripMenuItem.Size = new System.Drawing.Size(226, 22); + this.importToolStripMenuItem.Text = "Import an existing installation"; + this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click); + // + // importButton + // + this.importButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.importButton.Image = global::MultiMC.Properties.Resources.document_import; + this.importButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.importButton.Name = "importButton"; + this.importButton.Size = new System.Drawing.Size(23, 22); + this.importButton.Text = "Import existing minecraft folder."; + this.importButton.Visible = false; + // + // viewInstanceFolder + // + this.viewInstanceFolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.viewInstanceFolder.Image = global::MultiMC.Properties.Resources.ViewFolderIcon; + this.viewInstanceFolder.ImageTransparentColor = System.Drawing.Color.Magenta; + this.viewInstanceFolder.Name = "viewInstanceFolder"; + this.viewInstanceFolder.Size = new System.Drawing.Size(23, 22); + this.viewInstanceFolder.Text = "View instance folder"; + // + // refreshButton + // + this.refreshButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.refreshButton.Image = global::MultiMC.Properties.Resources.RefreshInstIcon; + this.refreshButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.refreshButton.Name = "refreshButton"; + this.refreshButton.Size = new System.Drawing.Size(23, 22); + this.refreshButton.Text = "Refresh"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // settingsButton + // + this.settingsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.settingsButton.Image = global::MultiMC.Properties.Resources.SettingsIcon; + this.settingsButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.settingsButton.Name = "settingsButton"; + this.settingsButton.Size = new System.Drawing.Size(23, 22); + this.settingsButton.Text = "Settings"; + // + // checkUpdateButton + // + this.checkUpdateButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.checkUpdateButton.Image = global::MultiMC.Properties.Resources.CheckUpdateIcon; + this.checkUpdateButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.checkUpdateButton.Name = "checkUpdateButton"; + this.checkUpdateButton.Size = new System.Drawing.Size(23, 22); + this.checkUpdateButton.Text = "Check for updates..."; + // + // aboutButton + // + this.aboutButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.aboutButton.Image = global::MultiMC.Properties.Resources.AboutIcon; + this.aboutButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.aboutButton.Name = "aboutButton"; + this.aboutButton.Size = new System.Drawing.Size(56, 22); + this.aboutButton.Text = "About"; + // + // helpButton + // + this.helpButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.helpButton.Enabled = false; + this.helpButton.Image = global::MultiMC.Properties.Resources.HelpIcon; + this.helpButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.helpButton.Name = "helpButton"; + this.helpButton.Size = new System.Drawing.Size(48, 22); + this.helpButton.Text = "Help"; + // + // importLoginInfoButton + // + this.importLoginInfoButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.importLoginInfoButton.Image = global::MultiMC.Properties.Resources.importexporticon; + this.importLoginInfoButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.importLoginInfoButton.Name = "importLoginInfoButton"; + this.importLoginInfoButton.Size = new System.Drawing.Size(23, 22); + this.importLoginInfoButton.Text = "Copy Login Info"; + // + // instView + // + this.instView.Alignment = System.Windows.Forms.ListViewAlignment.SnapToGrid; + this.instView.AllowDrop = true; + this.instView.ContextMenuStrip = this.instanceContextMenu; + this.instView.Dock = System.Windows.Forms.DockStyle.Fill; + this.instView.LabelEdit = true; + this.instView.Location = new System.Drawing.Point(0, 0); + this.instView.MultiSelect = false; + this.instView.Name = "instView"; + this.instView.Size = new System.Drawing.Size(604, 314); + this.instView.TabIndex = 1; + this.instView.UseCompatibleStateImageBehavior = false; + this.instView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.instView_AfterLabelEdit); + this.instView.ItemActivate += new System.EventHandler(this.instView_ItemActivate); + this.instView.DragDrop += new System.Windows.Forms.DragEventHandler(this.instView_DragDrop); + this.instView.DragOver += new System.Windows.Forms.DragEventHandler(this.instView_DragOver); + this.instView.DragLeave += new System.EventHandler(this.instView_DragLeave); + this.instView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.instView_KeyDown); + // + // toolStripContainer + // + // + // toolStripContainer.BottomToolStripPanel + // + this.toolStripContainer.BottomToolStripPanel.Controls.Add(this.statusStrip1); + // + // toolStripContainer.ContentPanel + // + this.toolStripContainer.ContentPanel.AutoScroll = true; + this.toolStripContainer.ContentPanel.Controls.Add(this.instView); + this.toolStripContainer.ContentPanel.Size = new System.Drawing.Size(604, 314); + this.toolStripContainer.Dock = System.Windows.Forms.DockStyle.Fill; + this.toolStripContainer.Location = new System.Drawing.Point(0, 0); + this.toolStripContainer.Name = "toolStripContainer"; + this.toolStripContainer.Size = new System.Drawing.Size(604, 361); + this.toolStripContainer.TabIndex = 3; + this.toolStripContainer.Text = "toolStripContainer1"; + // + // toolStripContainer.TopToolStripPanel + // + this.toolStripContainer.TopToolStripPanel.Controls.Add(this.menuToolBar); + // + // statusStrip1 + // + this.statusStrip1.Dock = System.Windows.Forms.DockStyle.None; + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DragDropHintLabel}); - this.statusStrip1.Location = new System.Drawing.Point(0, 0); - this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(604, 22); - this.statusStrip1.TabIndex = 5; - this.statusStrip1.Text = "statusStrip1"; - // - // DragDropHintLabel - // - this.DragDropHintLabel.Name = "DragDropHintLabel"; - this.DragDropHintLabel.Size = new System.Drawing.Size(87, 17); - this.DragDropHintLabel.Text = "Drag Drop Hint"; - this.DragDropHintLabel.Visible = false; - // - // MainForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(604, 361); - this.Controls.Add(this.toolStripContainer); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "MainForm"; - this.Text = "MultiMC"; - this.Title = "MultiMC"; - this.instanceContextMenu.ResumeLayout(false); - this.menuToolBar.ResumeLayout(false); - this.menuToolBar.PerformLayout(); - this.toolStripContainer.BottomToolStripPanel.ResumeLayout(false); - this.toolStripContainer.BottomToolStripPanel.PerformLayout(); - this.toolStripContainer.ContentPanel.ResumeLayout(false); - this.toolStripContainer.TopToolStripPanel.ResumeLayout(false); - this.toolStripContainer.ResumeLayout(false); - this.toolStripContainer.PerformLayout(); - this.statusStrip1.ResumeLayout(false); - this.statusStrip1.PerformLayout(); - this.ResumeLayout(false); + this.statusStrip1.Location = new System.Drawing.Point(0, 0); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(604, 22); + this.statusStrip1.TabIndex = 5; + this.statusStrip1.Text = "statusStrip1"; + // + // DragDropHintLabel + // + this.DragDropHintLabel.Name = "DragDropHintLabel"; + this.DragDropHintLabel.Size = new System.Drawing.Size(78, 17); + this.DragDropHintLabel.Text = "Drag Drop Hint"; + this.DragDropHintLabel.Visible = false; + // + // MainForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(604, 361); + this.Controls.Add(this.toolStripContainer); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Name = "MainForm"; + this.Text = "MultiMC"; + this.Title = "MultiMC"; + this.instanceContextMenu.ResumeLayout(false); + this.menuToolBar.ResumeLayout(false); + this.menuToolBar.PerformLayout(); + this.toolStripContainer.BottomToolStripPanel.ResumeLayout(false); + this.toolStripContainer.BottomToolStripPanel.PerformLayout(); + this.toolStripContainer.ContentPanel.ResumeLayout(false); + this.toolStripContainer.TopToolStripPanel.ResumeLayout(false); + this.toolStripContainer.ResumeLayout(false); + this.toolStripContainer.PerformLayout(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.ResumeLayout(false); - } + } - #endregion - - private System.Windows.Forms.ContextMenuStrip instanceContextMenu; - private System.Windows.Forms.ToolStripMenuItem playToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private System.Windows.Forms.ToolStripMenuItem changeIconToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem editNotesToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem editModsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem rebuildJarToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem viewFolderToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; - private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem; - private System.Windows.Forms.ToolStrip menuToolBar; - private System.Windows.Forms.ToolStripButton viewInstanceFolder; - private System.Windows.Forms.ToolStripButton refreshButton; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripButton settingsButton; - private System.Windows.Forms.ToolStripButton checkUpdateButton; - private System.Windows.Forms.ToolStripButton aboutButton; - private System.Windows.Forms.ToolStripButton helpButton; - private System.Windows.Forms.ListView instView; - private System.Windows.Forms.ToolStripContainer toolStripContainer; - private System.Windows.Forms.ToolStripButton importButton; - private System.Windows.Forms.StatusStrip statusStrip1; - private System.Windows.Forms.ToolStripStatusLabel DragDropHintLabel; - private System.Windows.Forms.ToolStripMenuItem renameToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem manageSavesToolStripMenuItem; - private System.Windows.Forms.ToolStripSplitButton addInstButton; - private System.Windows.Forms.ToolStripMenuItem addNewToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem copyExistingToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem; - } -} + #endregion + private System.Windows.Forms.ContextMenuStrip instanceContextMenu; + private System.Windows.Forms.ToolStripMenuItem playToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripMenuItem changeIconToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem editNotesToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem editModsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem rebuildJarToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem viewFolderToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; + private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem; + private System.Windows.Forms.ToolStrip menuToolBar; + private System.Windows.Forms.ToolStripButton viewInstanceFolder; + private System.Windows.Forms.ToolStripButton refreshButton; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripButton settingsButton; + private System.Windows.Forms.ToolStripButton checkUpdateButton; + private System.Windows.Forms.ToolStripButton aboutButton; + private System.Windows.Forms.ToolStripButton helpButton; + private System.Windows.Forms.ListView instView; + private System.Windows.Forms.ToolStripContainer toolStripContainer; + private System.Windows.Forms.ToolStripButton importButton; + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.ToolStripStatusLabel DragDropHintLabel; + private System.Windows.Forms.ToolStripMenuItem renameToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem manageSavesToolStripMenuItem; + private System.Windows.Forms.ToolStripSplitButton addInstButton; + private System.Windows.Forms.ToolStripMenuItem addNewToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem copyExistingToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem; + private System.Windows.Forms.ToolStripButton importLoginInfoButton; + } +} \ No newline at end of file diff --git a/MultiMC/WinGUI/MainForm.cs b/MultiMC/WinGUI/MainForm.cs index 95a5156..5bf388e 100644 --- a/MultiMC/WinGUI/MainForm.cs +++ b/MultiMC/WinGUI/MainForm.cs @@ -275,6 +275,12 @@ public event EventHandler CheckUpdatesClicked remove { checkUpdateButton.Click -= value; } } + public event EventHandler ImportInstLoginInfoClicked + { + add { importLoginInfoButton.Click += value; } + remove { importLoginInfoButton.Click -= value; } + } + public event EventHandler HelpClicked { add { helpButton.Click += value; } @@ -391,7 +397,6 @@ protected virtual void OnInstanceAction(InstAction action, Instance inst = null) if (ViewInstFolderClicked != null) ViewInstFolderClicked(this, args); break; - case InstAction.Delete: if (DeleteInstClicked != null) DeleteInstClicked(this, args); @@ -424,7 +429,7 @@ protected enum InstAction EditMods, RebuildJar, ViewFolder, - + ImportInstLoginInfo, Delete, } @@ -462,7 +467,6 @@ private void viewFolderToolStripMenuItem_Click(object sender, EventArgs e) { OnInstanceAction(InstAction.ViewFolder); } - private void deleteToolStripMenuItem_Click(object sender, EventArgs e) { OnInstanceAction(InstAction.Delete); diff --git a/MultiMC/WinGUI/ToolbarIcons/importexporticon.png b/MultiMC/WinGUI/ToolbarIcons/importexporticon.png new file mode 100644 index 0000000000000000000000000000000000000000..0de3d8a10e8ab965fd21b5c9b833bd6f0a44478d GIT binary patch literal 1351 zcmV-N1-SZ&P)Mh`|EO)8*dXd(Y`xo{KI!)AY@pIcM%Y-}n2T2f>dV zo-*YwuIqW-8GPG+@cg*gBH?}#&e**lHlr-Gsbe7gtR}Ulr_aJ|IN{V(k_I|!t4h~9V5{pB| z5SUUfBx^ytDhg!92vHPx#yqp)^MHW&$BeNIoG~MzrKZO2tgThL0h$n8XFR!B z;`_d=YZGTSgA!$iOhiaW2_$3y1QQ^e%1>N1$IstT&;0_nj~j>MBO~`#U%a@0j0-P7 z^F|)d_;r)STe&|Fn@ zs=2Fpj7OJX#bQK#E6AHhQVXwChbfp0i%PX8x_RL(j{|J7H zjm_3nHI+Oa==ORn1nU4$CsB$7f%a7y{Kdj{m%e%D78V|)B4;vs&?G#}1hhkKD-%~8 zLbSHD!I7M0q7Pt&)rwP1rcfEgQ)F}!8H}P`RfV{y8T^}Tx_;?ogbgO$}Ygqe`?}~e>^=llJ}ln?Ka>& zF8Vkqe9tDC-K;1+GVDbDs$PKOP^8sjv5rAh!V!2FfF341t>;aTJC1hWu?`!J4`+Us z&Ln9)bm098wFP(7lpKrxqhJm10K7DpVg5?IbR)SfMhw(nTm2}n)?+`0sI(7>d0#Z6v7K~oE)#x8@N!7+j zTa@LkX1@T6p#H+C=(1fKdC#S?99S$P6ngubR=5x7kip@#QsWr42BhB3MMnSIONRdM~}{QfPTobPMF5eXd~Jp4S^!O?8Sv0c$`` z)iz!J-FE$p{9eG81%Q@dz=L)W(-Qz@Cc+3sf;n_Kf|60G>G1u53R}b1(d!p;WQAS! z{kAE|+19^GCf)dIo9NGr9=Xp3c&_nEvTtfzsrz^z~PRipx1E7y1CsuLF}wf#CQIXe`SHGqvn6`Z<_V zMDG}IGFsQ946RIU%ZO|fA;SatMg;eTtQSuA0gzFP#9$~L8)=35_8cvzCum56KI9(d zO~)(NW?>E&0s{=1FwSHyywV47Ee{4#7g>C60X?R=M}wx(8J+3z%H&P^Lx4%BCUIzE=+S76mN;Jtb1QH?~Pn*}F`!5-qjyHyErP2TZ002ov JPDHLkV1j38f=&Pc literal 0 HcmV?d00001 diff --git a/MultiMC/WinGUI/WinFormsGUIManager.cs b/MultiMC/WinGUI/WinFormsGUIManager.cs index 1c9fa65..f01180c 100644 --- a/MultiMC/WinGUI/WinFormsGUIManager.cs +++ b/MultiMC/WinGUI/WinFormsGUIManager.cs @@ -76,6 +76,11 @@ public IEditModsDialog EditModsDialog(Instance inst) return new EditModsForm(inst); } + public IImportLoginInfoDialog ImportLoginInfoDialog() + { + return new ImportLoginInfoForm(); + } + public void Run(IMainWindow mainWindow) { Application.Run(mainWindow as MainForm); From 85a2276d3d9b6af560a7d913d8c45e68f26272e1 Mon Sep 17 00:00:00 2001 From: Glought Date: Sat, 28 Apr 2012 01:35:05 -0700 Subject: [PATCH 3/4] fixed a bug --- MultiMC/GUI/IMainWindow.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MultiMC/GUI/IMainWindow.cs b/MultiMC/GUI/IMainWindow.cs index edbcd6c..8591aed 100644 --- a/MultiMC/GUI/IMainWindow.cs +++ b/MultiMC/GUI/IMainWindow.cs @@ -45,8 +45,9 @@ public interface IMainWindow : IWindow event EventHandler HelpClicked; event EventHandler AboutClicked; - - + + event EventHandler ImportInstLoginInfoClicked; + event EventHandler InstanceLaunched; event EventHandler ChangeIconClicked; From 75ef5928ede7d7df8f73049c37dc00f1e7739dd3 Mon Sep 17 00:00:00 2001 From: Glought Date: Sat, 28 Apr 2012 01:36:40 -0700 Subject: [PATCH 4/4] fixed a issue --- MultiMC/GTKGUI/GTKGUIManager.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MultiMC/GTKGUI/GTKGUIManager.cs b/MultiMC/GTKGUI/GTKGUIManager.cs index 78b4b8e..63cfc5d 100644 --- a/MultiMC/GTKGUI/GTKGUIManager.cs +++ b/MultiMC/GTKGUI/GTKGUIManager.cs @@ -137,5 +137,9 @@ public ITextInputDialog TextInputDialog(string message, string text = "") { return new TextInputDialog(message,text,mainWindow); } + public IImportLoginInfoDialog ImportLoginInfoDialog() + { + throw new NotImplementedException(); + } } }