ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove some delete controller images from the .sln file, GB Palette Config - misc dialog tweaks

This commit is contained in:
adelikat 2012-09-15 17:44:17 +00:00
parent 48eb366392
commit 644f7415b9
3 changed files with 309 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
BizHawk.Emulation/Consoles/Nintendo/Gameboy/ColorChooserForm.Designer.cs generated
View File

@ -43,9 +43,8 @@
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.OK = new System.Windows.Forms.Button();
this.Cancel = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.button5 = new System.Windows.Forms.Button();
@ -56,7 +55,7 @@
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Location = new System.Drawing.Point(42, 34);
this.panel1.Location = new System.Drawing.Point(42, 18);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(40, 32);
this.panel1.TabIndex = 0;
@ -65,7 +64,7 @@
// panel2
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel2.Location = new System.Drawing.Point(88, 34);
this.panel2.Location = new System.Drawing.Point(88, 18);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(40, 32);
this.panel2.TabIndex = 1;
@ -74,7 +73,7 @@
// panel3
//
this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel3.Location = new System.Drawing.Point(134, 34);
this.panel3.Location = new System.Drawing.Point(134, 18);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(40, 32);
this.panel3.TabIndex = 2;
@ -83,7 +82,7 @@
// panel4
//
this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel4.Location = new System.Drawing.Point(180, 34);
this.panel4.Location = new System.Drawing.Point(180, 18);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(40, 32);
this.panel4.TabIndex = 3;
@ -92,7 +91,7 @@
// panel5
//
this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel5.Location = new System.Drawing.Point(42, 72);
this.panel5.Location = new System.Drawing.Point(42, 56);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(40, 32);
this.panel5.TabIndex = 4;
@ -101,7 +100,7 @@
// panel6
//
this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel6.Location = new System.Drawing.Point(88, 72);
this.panel6.Location = new System.Drawing.Point(88, 56);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(40, 32);
this.panel6.TabIndex = 5;
@ -110,7 +109,7 @@
// panel7
//
this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel7.Location = new System.Drawing.Point(134, 72);
this.panel7.Location = new System.Drawing.Point(134, 56);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(40, 32);
this.panel7.TabIndex = 6;
@ -119,7 +118,7 @@
// panel8
//
this.panel8.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel8.Location = new System.Drawing.Point(180, 72);
this.panel8.Location = new System.Drawing.Point(180, 56);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(40, 32);
this.panel8.TabIndex = 7;
@ -128,7 +127,7 @@
// panel9
//
this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel9.Location = new System.Drawing.Point(42, 110);
this.panel9.Location = new System.Drawing.Point(42, 94);
this.panel9.Name = "panel9";
this.panel9.Size = new System.Drawing.Size(40, 32);
this.panel9.TabIndex = 8;
@ -137,7 +136,7 @@
// panel10
//
this.panel10.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel10.Location = new System.Drawing.Point(88, 110);
this.panel10.Location = new System.Drawing.Point(88, 94);
this.panel10.Name = "panel10";
this.panel10.Size = new System.Drawing.Size(40, 32);
this.panel10.TabIndex = 9;
@ -146,7 +145,7 @@
// panel11
//
this.panel11.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel11.Location = new System.Drawing.Point(134, 110);
this.panel11.Location = new System.Drawing.Point(134, 94);
this.panel11.Name = "panel11";
this.panel11.Size = new System.Drawing.Size(40, 32);
this.panel11.TabIndex = 10;
@ -155,7 +154,7 @@
// panel12
//
this.panel12.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel12.Location = new System.Drawing.Point(180, 110);
this.panel12.Location = new System.Drawing.Point(180, 94);
this.panel12.Name = "panel12";
this.panel12.Size = new System.Drawing.Size(40, 32);
this.panel12.TabIndex = 11;
@ -164,7 +163,7 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(14, 43);
this.label1.Location = new System.Drawing.Point(14, 27);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(22, 13);
this.label1.TabIndex = 12;
@ -173,7 +172,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(9, 82);
this.label2.Location = new System.Drawing.Point(9, 66);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(27, 13);
this.label2.TabIndex = 13;
@ -182,44 +181,37 @@
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(9, 119);
this.label3.Location = new System.Drawing.Point(9, 103);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(27, 13);
this.label3.TabIndex = 14;
this.label3.Text = "SP2";
//
// label7
// OK
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(45, 7);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(85, 13);
this.label7.TabIndex = 21;
this.label7.Text = "Select Pal Entry:";
this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.OK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.OK.Location = new System.Drawing.Point(145, 211);
this.OK.Name = "OK";
this.OK.Size = new System.Drawing.Size(75, 23);
this.OK.TabIndex = 22;
this.OK.Text = "&OK";
this.OK.UseVisualStyleBackColor = true;
//
// button1
// Cancel
//
this.button1.DialogResult = System.Windows.Forms.DialogResult.OK;
this.button1.Location = new System.Drawing.Point(42, 226);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 22;
this.button1.Text = "OK";
this.button1.UseVisualStyleBackColor = true;
//
// button2
//
this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.button2.Location = new System.Drawing.Point(123, 226);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(75, 23);
this.button2.TabIndex = 23;
this.button2.Text = "Cancel";
this.button2.UseVisualStyleBackColor = true;
this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.Cancel.Location = new System.Drawing.Point(226, 211);
this.Cancel.Name = "Cancel";
this.Cancel.Size = new System.Drawing.Size(75, 23);
this.Cancel.TabIndex = 23;
this.Cancel.Text = "&Cancel";
this.Cancel.UseVisualStyleBackColor = true;
//
// button3
//
this.button3.Location = new System.Drawing.Point(226, 38);
this.button3.Location = new System.Drawing.Point(226, 22);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(75, 23);
this.button3.TabIndex = 25;
@ -229,7 +221,7 @@
//
// button4
//
this.button4.Location = new System.Drawing.Point(226, 77);
this.button4.Location = new System.Drawing.Point(226, 61);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(75, 23);
this.button4.TabIndex = 26;
@ -239,7 +231,7 @@
//
// button5
//
this.button5.Location = new System.Drawing.Point(226, 114);
this.button5.Location = new System.Drawing.Point(226, 98);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(75, 23);
this.button5.TabIndex = 27;
@ -249,9 +241,9 @@
//
// button6
//
this.button6.Location = new System.Drawing.Point(42, 197);
this.button6.Location = new System.Drawing.Point(42, 137);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(75, 23);
this.button6.Size = new System.Drawing.Size(60, 23);
this.button6.TabIndex = 28;
this.button6.Text = "Load...";
this.button6.UseVisualStyleBackColor = true;
@ -259,9 +251,9 @@
//
// button7
//
this.button7.Location = new System.Drawing.Point(123, 197);
this.button7.Location = new System.Drawing.Point(114, 137);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(75, 23);
this.button7.Size = new System.Drawing.Size(60, 23);
this.button7.TabIndex = 29;
this.button7.Text = "Save...";
this.button7.UseVisualStyleBackColor = true;
@ -269,18 +261,19 @@
//
// ColorChooserForm
//
this.AcceptButton = this.OK;
this.AllowDrop = true;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(315, 259);
this.CancelButton = this.Cancel;
this.ClientSize = new System.Drawing.Size(315, 244);
this.Controls.Add(this.button7);
this.Controls.Add(this.button6);
this.Controls.Add(this.button5);
this.Controls.Add(this.button4);
this.Controls.Add(this.button3);
this.Controls.Add(this.button2);
this.Controls.Add(this.button1);
this.Controls.Add(this.label7);
this.Controls.Add(this.Cancel);
this.Controls.Add(this.OK);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
@ -297,7 +290,8 @@
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
this.Name = "ColorChooserForm";
this.Text = "ColorChooserForm";
this.ShowIcon = false;
this.Text = "Gameboy Pallete Config";
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.ColorChooserForm_DragDrop);
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.ColorChooserForm_DragEnter);
this.ResumeLayout(false);
@ -322,9 +316,8 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button OK;
private System.Windows.Forms.Button Cancel;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Button button5;

4
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -758,7 +758,6 @@
<None Include="config\ControllerImages\GENController.png" />
</ItemGroup>
<ItemGroup>
<Content Include="config\ControllerImages\NESController.png" />
<None Include="images\TurboFastForward.png" />
<None Include="images\cheat.png" />
<None Include="images\Cheats.ico" />
@ -768,7 +767,6 @@
<None Include="images\Pause.png" />
<None Include="images\Play.png" />
<None Include="config\ControllerImages\TI83Calculator.png" />
<None Include="config\ControllerImages\TI83CalculatorCrop.png" />
<None Include="images\whiteTriUp.png" />
<None Include="images\whiteTriDown.png" />
<None Include="images\whiteTriLeft.png" />
@ -836,8 +834,6 @@
<None Include="images\console16x16.png" />
<None Include="images\Import.png" />
<None Include="images\atari_controller.png" />
<None Include="config\ControllerImages\snes-controlpad.jpg" />
<None Include="config\ControllerImages\SNESController.jpg" />
<None Include="config\ControllerImages\NES_Controller.png" />
<None Include="config\ControllerImages\SNES_Controller.png" />
<None Include="config\ControllerImages\TI83_Controller.png" />

508
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff