diff --git a/BizHawk.Client.EmuHawk/BizBox.Designer.cs b/BizHawk.Client.EmuHawk/BizBox.Designer.cs index f1fc66d2d3..023647351a 100644 --- a/BizHawk.Client.EmuHawk/BizBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/BizBox.Designer.cs @@ -40,61 +40,17 @@ this.label5 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); - this.linkLabel13 = new System.Windows.Forms.LinkLabel(); - this.label39 = new System.Windows.Forms.Label(); - this.label40 = new System.Windows.Forms.Label(); - this.label36 = new System.Windows.Forms.Label(); - this.label35 = new System.Windows.Forms.Label(); - this.linkLabel12 = new System.Windows.Forms.LinkLabel(); - this.label34 = new System.Windows.Forms.Label(); - this.label33 = new System.Windows.Forms.Label(); - this.SaturnLinkLabel = new System.Windows.Forms.LinkLabel(); - this.label32 = new System.Windows.Forms.Label(); - this.linkLabel11 = new System.Windows.Forms.LinkLabel(); - this.linkLabel10 = new System.Windows.Forms.LinkLabel(); - this.linkLabel9 = new System.Windows.Forms.LinkLabel(); - this.linkLabel8 = new System.Windows.Forms.LinkLabel(); - this.linkLabel7 = new System.Windows.Forms.LinkLabel(); - this.linkLabel6 = new System.Windows.Forms.LinkLabel(); - this.linkLabel5 = new System.Windows.Forms.LinkLabel(); - this.label29 = new System.Windows.Forms.Label(); - this.label31 = new System.Windows.Forms.Label(); - this.linkLabel4 = new System.Windows.Forms.LinkLabel(); - this.label28 = new System.Windows.Forms.Label(); - this.label30 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.linkLabel3 = new System.Windows.Forms.LinkLabel(); - this.linkLabel2 = new System.Windows.Forms.LinkLabel(); - this.label24 = new System.Windows.Forms.Label(); - this.label25 = new System.Windows.Forms.Label(); - this.label26 = new System.Windows.Forms.Label(); - this.label21 = new System.Windows.Forms.Label(); - this.label22 = new System.Windows.Forms.Label(); - this.label23 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.label20 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label(); this.label37 = new System.Windows.Forms.Label(); + this.CoreInfoPanel = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.panel1.SuspendLayout(); this.SuspendLayout(); // // OK // this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.OK.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.OK.Location = new System.Drawing.Point(361, 568); + this.OK.Location = new System.Drawing.Point(361, 549); this.OK.Name = "OK"; this.OK.Size = new System.Drawing.Size(75, 23); this.OK.TabIndex = 0; @@ -116,7 +72,7 @@ // this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(236, 572); + this.linkLabel1.Location = new System.Drawing.Point(236, 553); this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.Size = new System.Drawing.Size(102, 13); this.linkLabel1.TabIndex = 2; @@ -197,473 +153,6 @@ this.label7.TabIndex = 10; this.label7.Text = "Deign, Brandon Evans, Pasky13, link_7777,"; // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panel1.Controls.Add(this.linkLabel13); - this.panel1.Controls.Add(this.label39); - this.panel1.Controls.Add(this.label40); - this.panel1.Controls.Add(this.label36); - this.panel1.Controls.Add(this.label35); - this.panel1.Controls.Add(this.linkLabel12); - this.panel1.Controls.Add(this.label34); - this.panel1.Controls.Add(this.label33); - this.panel1.Controls.Add(this.SaturnLinkLabel); - this.panel1.Controls.Add(this.label32); - this.panel1.Controls.Add(this.linkLabel11); - this.panel1.Controls.Add(this.linkLabel10); - this.panel1.Controls.Add(this.linkLabel9); - this.panel1.Controls.Add(this.linkLabel8); - this.panel1.Controls.Add(this.linkLabel7); - this.panel1.Controls.Add(this.linkLabel6); - this.panel1.Controls.Add(this.linkLabel5); - this.panel1.Controls.Add(this.label29); - this.panel1.Controls.Add(this.label31); - this.panel1.Controls.Add(this.linkLabel4); - this.panel1.Controls.Add(this.label28); - this.panel1.Controls.Add(this.label30); - this.panel1.Controls.Add(this.label12); - this.panel1.Controls.Add(this.label15); - this.panel1.Controls.Add(this.linkLabel3); - this.panel1.Controls.Add(this.linkLabel2); - this.panel1.Controls.Add(this.label24); - this.panel1.Controls.Add(this.label25); - this.panel1.Controls.Add(this.label26); - this.panel1.Controls.Add(this.label21); - this.panel1.Controls.Add(this.label22); - this.panel1.Controls.Add(this.label23); - this.panel1.Controls.Add(this.label17); - this.panel1.Controls.Add(this.label20); - this.panel1.Controls.Add(this.label18); - this.panel1.Controls.Add(this.label19); - this.panel1.Controls.Add(this.label14); - this.panel1.Controls.Add(this.label16); - this.panel1.Controls.Add(this.label11); - this.panel1.Controls.Add(this.label13); - this.panel1.Controls.Add(this.label10); - this.panel1.Controls.Add(this.label9); - this.panel1.Controls.Add(this.label8); - this.panel1.Location = new System.Drawing.Point(12, 185); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(423, 377); - this.panel1.TabIndex = 11; - // - // linkLabel13 - // - this.linkLabel13.AutoSize = true; - this.linkLabel13.Location = new System.Drawing.Point(16, 335); - this.linkLabel13.Name = "linkLabel13"; - this.linkLabel13.Size = new System.Drawing.Size(50, 13); - this.linkLabel13.TabIndex = 46; - this.linkLabel13.TabStop = true; - this.linkLabel13.Text = "quicknes"; - this.linkLabel13.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel13_LinkClicked); - // - // label39 - // - this.label39.AutoSize = true; - this.label39.Location = new System.Drawing.Point(16, 348); - this.label39.Name = "label39"; - this.label39.Size = new System.Drawing.Size(114, 13); - this.label39.TabIndex = 44; - this.label39.Text = "author: blargg, kode54"; - // - // label40 - // - this.label40.AutoSize = true; - this.label40.Location = new System.Drawing.Point(8, 320); - this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(80, 13); - this.label40.TabIndex = 43; - this.label40.Text = "QuicknesHawk"; - // - // label36 - // - this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(211, 311); - this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(91, 13); - this.label36.TabIndex = 42; - this.label36.Text = "author: ekeeke31"; - // - // label35 - // - this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(212, 298); - this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(28, 13); - this.label35.TabIndex = 41; - this.label35.Text = "r580"; - // - // linkLabel12 - // - this.linkLabel12.AutoSize = true; - this.linkLabel12.Location = new System.Drawing.Point(212, 285); - this.linkLabel12.Name = "linkLabel12"; - this.linkLabel12.Size = new System.Drawing.Size(84, 13); - this.linkLabel12.TabIndex = 40; - this.linkLabel12.TabStop = true; - this.linkLabel12.Text = "Genesis Plus Gx"; - this.linkLabel12.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel12_LinkClicked); - // - // label34 - // - this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(204, 272); - this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(73, 13); - this.label34.TabIndex = 39; - this.label34.Text = "GenesisHawk"; - // - // label33 - // - this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(212, 253); - this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(76, 13); - this.label33.TabIndex = 38; - this.label33.Text = "Ported by: natt"; - // - // SaturnLinkLabel - // - this.SaturnLinkLabel.AutoSize = true; - this.SaturnLinkLabel.Location = new System.Drawing.Point(212, 242); - this.SaturnLinkLabel.Name = "SaturnLinkLabel"; - this.SaturnLinkLabel.Size = new System.Drawing.Size(79, 13); - this.SaturnLinkLabel.TabIndex = 37; - this.SaturnLinkLabel.TabStop = true; - this.SaturnLinkLabel.Text = "Yabause v9.12"; - this.SaturnLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.SaturnLinkLabel_LinkClicked); - // - // label32 - // - this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(204, 227); - this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(66, 13); - this.label32.TabIndex = 36; - this.label32.Text = "SaturnHawk"; - // - // linkLabel11 - // - this.linkLabel11.AutoSize = true; - this.linkLabel11.Location = new System.Drawing.Point(21, 282); - this.linkLabel11.Name = "linkLabel11"; - this.linkLabel11.Size = new System.Drawing.Size(88, 13); - this.linkLabel11.TabIndex = 35; - this.linkLabel11.TabStop = true; - this.linkLabel11.Text = "Glide64: bfe79ce"; - this.linkLabel11.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel11_LinkClicked); - // - // linkLabel10 - // - this.linkLabel10.AutoSize = true; - this.linkLabel10.Location = new System.Drawing.Point(21, 269); - this.linkLabel10.Name = "linkLabel10"; - this.linkLabel10.Size = new System.Drawing.Size(111, 13); - this.linkLabel10.TabIndex = 34; - this.linkLabel10.TabStop = true; - this.linkLabel10.Text = "Glide64mk2: 158331c"; - this.linkLabel10.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel10_LinkClicked); - // - // linkLabel9 - // - this.linkLabel9.AutoSize = true; - this.linkLabel9.Location = new System.Drawing.Point(21, 256); - this.linkLabel9.Name = "linkLabel9"; - this.linkLabel9.Size = new System.Drawing.Size(77, 13); - this.linkLabel9.TabIndex = 33; - this.linkLabel9.TabStop = true; - this.linkLabel9.Text = "Rice: e25d038"; - this.linkLabel9.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel9_LinkClicked); - // - // linkLabel8 - // - this.linkLabel8.AutoSize = true; - this.linkLabel8.Location = new System.Drawing.Point(21, 243); - this.linkLabel8.Name = "linkLabel8"; - this.linkLabel8.Size = new System.Drawing.Size(108, 13); - this.linkLabel8.TabIndex = 32; - this.linkLabel8.TabStop = true; - this.linkLabel8.Text = "Win32 Deps: f816fb4"; - this.linkLabel8.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel8_LinkClicked); - // - // linkLabel7 - // - this.linkLabel7.AutoSize = true; - this.linkLabel7.Location = new System.Drawing.Point(21, 230); - this.linkLabel7.Name = "linkLabel7"; - this.linkLabel7.Size = new System.Drawing.Size(77, 13); - this.linkLabel7.TabIndex = 31; - this.linkLabel7.TabStop = true; - this.linkLabel7.Text = "RSP: dee8e63"; - this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked); - // - // linkLabel6 - // - this.linkLabel6.AutoSize = true; - this.linkLabel6.Location = new System.Drawing.Point(21, 217); - this.linkLabel6.Name = "linkLabel6"; - this.linkLabel6.Size = new System.Drawing.Size(71, 13); - this.linkLabel6.TabIndex = 30; - this.linkLabel6.TabStop = true; - this.linkLabel6.Text = "Core: f17a1af"; - this.linkLabel6.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel6_LinkClicked); - // - // linkLabel5 - // - this.linkLabel5.AutoSize = true; - this.linkLabel5.Location = new System.Drawing.Point(21, 204); - this.linkLabel5.Name = "linkLabel5"; - this.linkLabel5.Size = new System.Drawing.Size(96, 13); - this.linkLabel5.TabIndex = 29; - this.linkLabel5.TabStop = true; - this.linkLabel5.Text = "Mupen64Plus v2.0"; - this.linkLabel5.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel5_LinkClicked); - // - // label29 - // - this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(21, 295); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(101, 13); - this.label29.TabIndex = 28; - this.label29.Text = "Ported by: micro500"; - // - // label31 - // - this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(8, 190); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(55, 13); - this.label31.TabIndex = 27; - this.label31.Text = "N64Hawk"; - // - // linkLabel4 - // - this.linkLabel4.AutoSize = true; - this.linkLabel4.Location = new System.Drawing.Point(212, 194); - this.linkLabel4.Name = "linkLabel4"; - this.linkLabel4.Size = new System.Drawing.Size(79, 13); - this.linkLabel4.TabIndex = 26; - this.linkLabel4.TabStop = true; - this.linkLabel4.Text = "EMU7800 v1.5"; - this.linkLabel4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel4_LinkClicked); - // - // label28 - // - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(212, 207); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(104, 13); - this.label28.TabIndex = 25; - this.label28.Text = "author: Mike Murphy"; - // - // label30 - // - this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(204, 179); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(80, 13); - this.label30.TabIndex = 23; - this.label30.Text = "Atari7800Hawk"; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(21, 168); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(94, 13); - this.label12.TabIndex = 22; - this.label12.Text = "Created by: vecna"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(8, 154); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(68, 13); - this.label15.TabIndex = 21; - this.label15.Text = "ColecoHawk"; - // - // linkLabel3 - // - this.linkLabel3.AutoSize = true; - this.linkLabel3.Location = new System.Drawing.Point(21, 70); - this.linkLabel3.Name = "linkLabel3"; - this.linkLabel3.Size = new System.Drawing.Size(56, 13); - this.linkLabel3.TabIndex = 20; - this.linkLabel3.TabStop = true; - this.linkLabel3.Text = "bsnes v87"; - this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked); - // - // linkLabel2 - // - this.linkLabel2.AutoSize = true; - this.linkLabel2.Location = new System.Drawing.Point(20, 119); - this.linkLabel2.Name = "linkLabel2"; - this.linkLabel2.Size = new System.Drawing.Size(51, 13); - this.linkLabel2.TabIndex = 19; - this.linkLabel2.TabStop = true; - this.linkLabel2.Text = "gambatte"; - this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); - // - // label24 - // - this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(212, 159); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(150, 13); - this.label24.TabIndex = 18; - this.label24.Text = "Contributers: adelikat, thebrick"; - // - // label25 - // - this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(212, 145); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(103, 13); - this.label25.TabIndex = 17; - this.label25.Text = "Created by: zeromus"; - // - // label26 - // - this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(204, 131); - this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(57, 13); - this.label26.TabIndex = 16; - this.label26.Text = "TI83Hawk"; - // - // label21 - // - this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(209, 108); - this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(175, 13); - this.label21.TabIndex = 15; - this.label21.Text = "Contributers: adelikat, zeromus, natt"; - // - // label22 - // - this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(209, 94); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(107, 13); - this.label22.TabIndex = 14; - this.label22.Text = "Created by: micro500"; - // - // label23 - // - this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(204, 80); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(80, 13); - this.label23.TabIndex = 13; - this.label23.Text = "Atari2600Hawk"; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(209, 59); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(94, 13); - this.label17.TabIndex = 12; - this.label17.Text = "Created by: vecna"; - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(204, 45); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(58, 13); - this.label20.TabIndex = 11; - this.label20.Text = "SMSHawk"; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(212, 23); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(94, 13); - this.label18.TabIndex = 10; - this.label18.Text = "Created by: vecna"; - // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(204, 9); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(56, 13); - this.label19.TabIndex = 9; - this.label19.Text = "PCEHawk"; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(21, 133); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(81, 13); - this.label14.TabIndex = 8; - this.label14.Text = "author: sinamas"; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(8, 107); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(50, 13); - this.label16.TabIndex = 6; - this.label16.Text = "GBHawk"; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(21, 85); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(66, 13); - this.label11.TabIndex = 5; - this.label11.Text = "author: byuu"; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(8, 57); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(64, 13); - this.label13.TabIndex = 3; - this.label13.Text = "SNESHawk"; - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(16, 37); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(166, 13); - this.label10.TabIndex = 2; - this.label10.Text = "Contributers: adelikat, natt, taotao"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(16, 23); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(103, 13); - this.label9.TabIndex = 1; - this.label9.Text = "Created by: zeromus"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(8, 9); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(57, 13); - this.label8.TabIndex = 0; - this.label8.Text = "NESHawk"; - // // label27 // this.label27.AutoSize = true; @@ -682,16 +171,28 @@ this.label37.TabIndex = 13; this.label37.Text = "null_ptr, MightyMar"; // + // CoreInfoPanel + // + this.CoreInfoPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.CoreInfoPanel.AutoScroll = true; + this.CoreInfoPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.CoreInfoPanel.Location = new System.Drawing.Point(12, 180); + this.CoreInfoPanel.Name = "CoreInfoPanel"; + this.CoreInfoPanel.Size = new System.Drawing.Size(423, 363); + this.CoreInfoPanel.TabIndex = 14; + // // BizBox // this.AcceptButton = this.OK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.OK; - this.ClientSize = new System.Drawing.Size(448, 600); + this.ClientSize = new System.Drawing.Size(448, 581); + this.Controls.Add(this.CoreInfoPanel); this.Controls.Add(this.label37); this.Controls.Add(this.label27); - this.Controls.Add(this.panel1); this.Controls.Add(this.label7); this.Controls.Add(this.label6); this.Controls.Add(this.label5); @@ -704,15 +205,12 @@ this.Controls.Add(this.pictureBox1); this.Controls.Add(this.OK); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MaximumSize = new System.Drawing.Size(900, 638); this.MinimumSize = new System.Drawing.Size(453, 253); this.Name = "BizBox"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = " BizHawk"; this.Load += new System.EventHandler(this.BizBox_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -731,51 +229,8 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label7; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label label24; - private System.Windows.Forms.Label label25; - private System.Windows.Forms.Label label26; - private System.Windows.Forms.Label label21; - private System.Windows.Forms.Label label22; - private System.Windows.Forms.Label label23; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label label20; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label label19; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label9; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.LinkLabel linkLabel2; - private System.Windows.Forms.LinkLabel linkLabel3; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label15; private System.Windows.Forms.Label label27; - private System.Windows.Forms.Label label28; - private System.Windows.Forms.Label label30; - private System.Windows.Forms.LinkLabel linkLabel4; - private System.Windows.Forms.LinkLabel linkLabel5; - private System.Windows.Forms.Label label29; - private System.Windows.Forms.Label label31; - private System.Windows.Forms.LinkLabel linkLabel11; - private System.Windows.Forms.LinkLabel linkLabel10; - private System.Windows.Forms.LinkLabel linkLabel9; - private System.Windows.Forms.LinkLabel linkLabel8; - private System.Windows.Forms.LinkLabel linkLabel7; - private System.Windows.Forms.LinkLabel linkLabel6; - private System.Windows.Forms.Label label33; - private System.Windows.Forms.LinkLabel SaturnLinkLabel; - private System.Windows.Forms.Label label32; - private System.Windows.Forms.LinkLabel linkLabel12; - private System.Windows.Forms.Label label34; - private System.Windows.Forms.Label label36; - private System.Windows.Forms.Label label35; private System.Windows.Forms.Label label37; - private System.Windows.Forms.Label label39; - private System.Windows.Forms.Label label40; - private System.Windows.Forms.LinkLabel linkLabel13; + private System.Windows.Forms.Panel CoreInfoPanel; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/BizBox.cs b/BizHawk.Client.EmuHawk/BizBox.cs index b4727bebab..419568b892 100644 --- a/BizHawk.Client.EmuHawk/BizBox.cs +++ b/BizHawk.Client.EmuHawk/BizBox.cs @@ -1,4 +1,7 @@ -using System; +using BizHawk.Emulation.Common; +using System; +using System.Linq; +using System.Reflection; using System.Windows.Forms; namespace BizHawk.Client.EmuHawk @@ -33,84 +36,25 @@ namespace BizHawk.Client.EmuHawk } VersionLabel.Text = "Version " + VersionInfo.MAINVERSION + " " + VersionInfo.RELEASEDATE; - } - private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel3.LinkVisited = true; - System.Diagnostics.Process.Start("http://byuu.org/bsnes/"); - } + var cores = Assembly + .Load("BizHawk.Emulation.Cores") + .GetTypes() + .Where(t => typeof(IEmulator).IsAssignableFrom(t)) + .Select(t => t.GetCustomAttributes(false).OfType().FirstOrDefault()) + .Where(a => a != null) + .Where(a => a.Released) + .OrderByDescending(a => a.CoreName.ToLower()) + .ToList(); - private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel2.LinkVisited = true; - System.Diagnostics.Process.Start("http://gambatte.sourceforge.net/"); - } + foreach(var core in cores) + { + CoreInfoPanel.Controls.Add(new BizBoxInfoControl(core) + { + Dock = DockStyle.Top + }); - private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel4.LinkVisited = true; - System.Diagnostics.Process.Start("http://emu7800.sourceforge.net/"); - } - - private void linkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel5.LinkVisited = true; - System.Diagnostics.Process.Start("https://code.google.com/p/mupen64plus/"); - } - - private void linkLabel6_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel6.LinkVisited = true; - System.Diagnostics.Process.Start("https://bitbucket.org/richard42/mupen64plus-core/"); - } - - private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel7.LinkVisited = true; - System.Diagnostics.Process.Start("https://bitbucket.org/richard42/mupen64plus-rsp-hle/"); - } - - private void linkLabel8_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel8.LinkVisited = true; - System.Diagnostics.Process.Start("https://bitbucket.org/richard42/mupen64plus-win32-deps/"); - } - - private void linkLabel9_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel9.LinkVisited = true; - System.Diagnostics.Process.Start("https://bitbucket.org/richard42/mupen64plus-video-rice/"); - } - - private void linkLabel10_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel10.LinkVisited = true; - System.Diagnostics.Process.Start("https://bitbucket.org/richard42/mupen64plus-video-glide64mk2"); - } - - private void linkLabel11_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel11.LinkVisited = true; - System.Diagnostics.Process.Start("https://bitbucket.org/wahrhaft/mupen64plus-video-glide64/"); - } - - private void SaturnLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - SaturnLinkLabel.LinkVisited = true; - System.Diagnostics.Process.Start("http://yabause.org"); - } - - private void linkLabel12_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel12.LinkVisited = true; - System.Diagnostics.Process.Start("https://code.google.com/p/genplus-gx/"); - } - - private void linkLabel13_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - linkLabel13.LinkVisited = true; - System.Diagnostics.Process.Start("https://github.com/kode54/QuickNES"); + } } } } diff --git a/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs b/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs new file mode 100644 index 0000000000..ca31f873c6 --- /dev/null +++ b/BizHawk.Client.EmuHawk/BizBoxInfoControl.Designer.cs @@ -0,0 +1,108 @@ +namespace BizHawk.Client.EmuHawk +{ + partial class BizBoxInfoControl + { + /// + /// 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); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.CoreNameLabel = new System.Windows.Forms.Label(); + this.CoreAuthorLabel = new System.Windows.Forms.Label(); + this.CorePortedLabel = new System.Windows.Forms.Label(); + this.CoreUrlLink = new System.Windows.Forms.LinkLabel(); + this.SuspendLayout(); + // + // CoreNameLabel + // + this.CoreNameLabel.AutoSize = true; + this.CoreNameLabel.Dock = System.Windows.Forms.DockStyle.Left; + this.CoreNameLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.CoreNameLabel.Location = new System.Drawing.Point(0, 0); + this.CoreNameLabel.MinimumSize = new System.Drawing.Size(100, 23); + this.CoreNameLabel.Name = "CoreNameLabel"; + this.CoreNameLabel.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); + this.CoreNameLabel.Size = new System.Drawing.Size(100, 23); + this.CoreNameLabel.TabIndex = 0; + this.CoreNameLabel.Text = "label1"; + // + // CoreAuthorLabel + // + this.CoreAuthorLabel.AutoSize = true; + this.CoreAuthorLabel.Dock = System.Windows.Forms.DockStyle.Left; + this.CoreAuthorLabel.Location = new System.Drawing.Point(100, 0); + this.CoreAuthorLabel.Name = "CoreAuthorLabel"; + this.CoreAuthorLabel.Padding = new System.Windows.Forms.Padding(5, 5, 0, 0); + this.CoreAuthorLabel.Size = new System.Drawing.Size(40, 18); + this.CoreAuthorLabel.TabIndex = 1; + this.CoreAuthorLabel.Text = "label2"; + // + // CorePortedLabel + // + this.CorePortedLabel.AutoSize = true; + this.CorePortedLabel.Dock = System.Windows.Forms.DockStyle.Left; + this.CorePortedLabel.Location = new System.Drawing.Point(140, 0); + this.CorePortedLabel.Name = "CorePortedLabel"; + this.CorePortedLabel.Padding = new System.Windows.Forms.Padding(5, 5, 0, 0); + this.CorePortedLabel.Size = new System.Drawing.Size(40, 18); + this.CorePortedLabel.TabIndex = 2; + this.CorePortedLabel.Text = "label3"; + // + // CoreUrlLink + // + this.CoreUrlLink.AutoSize = true; + this.CoreUrlLink.Dock = System.Windows.Forms.DockStyle.Left; + this.CoreUrlLink.Location = new System.Drawing.Point(180, 0); + this.CoreUrlLink.Name = "CoreUrlLink"; + this.CoreUrlLink.Padding = new System.Windows.Forms.Padding(5, 5, 0, 0); + this.CoreUrlLink.Size = new System.Drawing.Size(60, 18); + this.CoreUrlLink.TabIndex = 3; + this.CoreUrlLink.TabStop = true; + this.CoreUrlLink.Text = "linkLabel1"; + this.CoreUrlLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.CoreUrlLink_LinkClicked); + // + // BizBoxInfoControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.CoreUrlLink); + this.Controls.Add(this.CorePortedLabel); + this.Controls.Add(this.CoreAuthorLabel); + this.Controls.Add(this.CoreNameLabel); + this.Name = "BizBoxInfoControl"; + this.Size = new System.Drawing.Size(359, 25); + this.Load += new System.EventHandler(this.BizBoxInfoControl_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label CoreNameLabel; + private System.Windows.Forms.Label CoreAuthorLabel; + private System.Windows.Forms.Label CorePortedLabel; + private System.Windows.Forms.LinkLabel CoreUrlLink; + } +} diff --git a/BizHawk.Client.EmuHawk/BizBoxInfoControl.cs b/BizHawk.Client.EmuHawk/BizBoxInfoControl.cs new file mode 100644 index 0000000000..a619682b80 --- /dev/null +++ b/BizHawk.Client.EmuHawk/BizBoxInfoControl.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +using BizHawk.Emulation.Common; + +namespace BizHawk.Client.EmuHawk +{ + public partial class BizBoxInfoControl : UserControl + { + private string url = string.Empty; + + public BizBoxInfoControl(CoreAttributes attributes) + { + if (attributes.CoreName.ToLower().StartsWith("bs")) + { + int zzz = 0; + } + + InitializeComponent(); + CoreNameLabel.Text = attributes.CoreName; + + if (!string.IsNullOrEmpty(attributes.Author)) + { + CoreAuthorLabel.Text = "authors: " + attributes.Author; + } + else + { + CoreAuthorLabel.Visible = false; + } + + CorePortedLabel.Text = attributes.Ported ? " (Ported)" : string.Empty; + + if (!attributes.Ported) + { + CoreUrlLink.Visible = false; + } + else + { + CoreUrlLink.Visible = true; + CoreUrlLink.Text = attributes.PortedVersion; + url = attributes.PortedUrl; + } + } + + private void BizBoxInfoControl_Load(object sender, EventArgs e) + { + + } + + private void CoreUrlLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + CoreUrlLink.LinkVisited = true; + System.Diagnostics.Process.Start(url); + } + } +} diff --git a/BizHawk.Client.EmuHawk/BizBoxInfoControl.resx b/BizHawk.Client.EmuHawk/BizBoxInfoControl.resx new file mode 100644 index 0000000000..29dcb1b3a3 --- /dev/null +++ b/BizHawk.Client.EmuHawk/BizBoxInfoControl.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 5d26592b92..02727d7f8b 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -164,6 +164,12 @@ BizBox.cs + + UserControl + + + BizBoxInfoControl.cs + Component @@ -992,6 +998,9 @@ VideoWriterChooserForm.cs + + BizBoxInfoControl.cs + AnalogRangeConfigControl.cs diff --git a/BizHawk.Emulation.Common/CoreAttributes.cs b/BizHawk.Emulation.Common/CoreAttributes.cs index 6dcbb12a61..6b5a694662 100644 --- a/BizHawk.Emulation.Common/CoreAttributes.cs +++ b/BizHawk.Emulation.Common/CoreAttributes.cs @@ -4,17 +4,27 @@ namespace BizHawk.Emulation.Common { public class CoreAttributes : Attribute { - public CoreAttributes(string name, string author, bool isPorted = false, bool isReleased = false) + public CoreAttributes( + string name, + string author, + bool isPorted = false, + bool isReleased = false, + string portedVersion = "", + string portedUrl = "") { CoreName = name; Author = author; Ported = isPorted; Released = isReleased; + PortedVersion = portedVersion; + PortedUrl = portedUrl; } public string CoreName { get; private set; } public string Author { get; private set; } public bool Ported { get; private set; } public bool Released { get; private set; } + public string PortedVersion { get; private set; } + public string PortedUrl { get; private set; } } } diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs index 176541e860..f20c055d94 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs @@ -10,9 +10,11 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800 { [CoreAttributes( "EMU7800", - "Mike Murphy", + "", isPorted: true, - isReleased: true + isReleased: true, + portedVersion: "v1.5", + portedUrl: "http://emu7800.sourceforge.net/" )] public partial class Atari7800 : IEmulator { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs index bfa0ed525d..1f489b5635 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -14,9 +14,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy /// [CoreAttributes( "Gambatte", - "sinamas", + "", isPorted: true, - isReleased: true + isReleased: true, + portedVersion: "SVN 344", + portedUrl: "http://gambatte.sourceforge.net/" )] public class Gameboy : IEmulator, IVideoProvider, ISyncSoundProvider { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs index c9141970f3..d6ee213028 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs @@ -12,9 +12,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 { [CoreAttributes( "Mupen64Plus", - "Richard Goedeken", + "", isPorted: true, - isReleased: true + isReleased: true, + portedVersion: "2.0", + portedUrl: "https://code.google.com/p/mupen64plus/" )] public class N64 : IEmulator { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs index 9fa418d557..5c3de24dd3 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs @@ -12,9 +12,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES { [CoreAttributes( "QuickNes", - "blargg, kode54", + "", isPorted: true, - isReleased: true + isReleased: true, + portedVersion: "0.7.0", + portedUrl: "https://github.com/kode54/QuickNES" )] public class QuickNES : IEmulator, IVideoProvider, ISyncSoundProvider { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs index c244874c0a..e44baab0a1 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs @@ -61,7 +61,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES "BSNES", "byuu", isPorted: true, - isReleased: true + isReleased: true, + portedVersion: "v87", + portedUrl: "http://byuu.org/" )] public unsafe class LibsnesCore : IEmulator, IVideoProvider { diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs index 1764f62d7b..b9982600b4 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs @@ -16,9 +16,11 @@ namespace BizHawk.Emulation.Cores.Sega.Saturn { [CoreAttributes( "Yabause", - "Guillaume", + "", isPorted: true, - isReleased: true + isReleased: true, + portedVersion: "9.12", + portedUrl: "http://yabause.org" )] public class Yabause : IEmulator, IVideoProvider, ISyncSoundProvider { diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs index 3b4005baad..580af5ea11 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGX.cs @@ -17,9 +17,11 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx { [CoreAttributes( "Genplus-gx", - "ekeeke31", + "", isPorted: true, - isReleased: true + isReleased: true, + portedVersion: "r580", + portedUrl: "https://code.google.com/p/genplus-gx/" )] public class GPGX : IEmulator, ISyncSoundProvider, IVideoProvider { diff --git a/VersionInfo.cs b/VersionInfo.cs index 8f96657924..8fe145b869 100644 --- a/VersionInfo.cs +++ b/VersionInfo.cs @@ -4,7 +4,7 @@ static class VersionInfo { public const string MAINVERSION = "1.7.0"; public static string RELEASEDATE = "Unoffical BETA of unknown origin!"; - public static bool INTERIM = true; + public static bool INTERIM = false; public static string GetEmuVersion() {