DarkCat09/MultRedactor
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge branch 'master' into ArkLightning-patch-1

Browse source
This commit is contained in:
Mikhail Abramov 2018-03-16 21:10:50 +03:00 • committed by GitHub
commit 9ee831f031
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 99 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

12
WindowsFormsApplication1/WindowsFormsApplication1/MainForm.Designer.cs generated
View file

@ -78,6 +78,7 @@
this.ButtonAddChar = new System.Windows.Forms.Button();
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.textBox1 = new System.Windows.Forms.TextBox();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PictureBoxBackground)).BeginInit();
this.panel2.SuspendLayout();
@ -393,6 +394,7 @@
//
// panel3
//
this.panel3.Controls.Add(this.textBox1);
this.panel3.Controls.Add(this.SpriteNumberLabel);
this.panel3.Controls.Add(this.SpriteNumberTextBox);
this.panel3.Controls.Add(this.OpenButton);
@ -529,6 +531,7 @@
this.TextBoxWall1.Name = "TextBoxWall1";
this.TextBoxWall1.Size = new System.Drawing.Size(100, 20);
this.TextBoxWall1.TabIndex = 2;
this.TextBoxWall1.TextChanged += new System.EventHandler(this.TextBoxWall1_TextChanged);
//
// ComboBoxMove
//
@ -578,6 +581,14 @@
//
this.openFileDialog1.FileName = "openFileDialog1";
//
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(132, 114);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(235, 20);
this.textBox1.TabIndex = 17;
this.textBox1.Text = "Здесь должна быть кнопка амплитуды X Y !!!";
//
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -652,6 +663,7 @@
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button6;
private System.Windows.Forms.Button button5;
private System.Windows.Forms.TextBox textBox1;
}
}