Bug fixing

This commit is contained in:
Mikhail Abramov 2018-04-24 19:13:18 +03:00
parent 3e72e16a1d
commit 7461555de7
2 changed files with 133 additions and 127 deletions

View file

@ -43,6 +43,8 @@ namespace WindowsFormsApplication1
this.SaveCharButton = new System.Windows.Forms.Button(); this.SaveCharButton = new System.Windows.Forms.Button();
this.personPanel = new System.Windows.Forms.Panel(); this.personPanel = new System.Windows.Forms.Panel();
this.charNameBox = new System.Windows.Forms.TextBox(); this.charNameBox = new System.Windows.Forms.TextBox();
this.circlesTextBox = new System.Windows.Forms.TextBox();
this.circlesLabel = new System.Windows.Forms.Label();
this.charNameLabel = new System.Windows.Forms.Label(); this.charNameLabel = new System.Windows.Forms.Label();
this.openSpace = new System.Windows.Forms.PictureBox(); this.openSpace = new System.Windows.Forms.PictureBox();
this.SpriteNumberLabel = new System.Windows.Forms.Label(); this.SpriteNumberLabel = new System.Windows.Forms.Label();
@ -64,8 +66,6 @@ namespace WindowsFormsApplication1
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.leftPanel.SuspendLayout(); this.leftPanel.SuspendLayout();
this.textBox1 = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.PictureBoxBackground)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PictureBoxBackground)).BeginInit();
this.rightPanel.SuspendLayout(); this.rightPanel.SuspendLayout();
this.personPanel.SuspendLayout(); this.personPanel.SuspendLayout();
@ -76,35 +76,39 @@ namespace WindowsFormsApplication1
// //
this.LabelData.AutoSize = true; this.LabelData.AutoSize = true;
this.LabelData.Font = new System.Drawing.Font("Arial Black", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); this.LabelData.Font = new System.Drawing.Font("Arial Black", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.LabelData.Location = new System.Drawing.Point(0, 9); this.LabelData.Location = new System.Drawing.Point(0, 11);
this.LabelData.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LabelData.Name = "LabelData"; this.LabelData.Name = "LabelData";
this.LabelData.Size = new System.Drawing.Size(234, 23); this.LabelData.Size = new System.Drawing.Size(290, 28);
this.LabelData.TabIndex = 0; this.LabelData.TabIndex = 0;
this.LabelData.Text = "Данные о мультфильме:"; this.LabelData.Text = "Данные о мультфильме:";
// //
// LabelLengh // LabelLengh
// //
this.LabelLengh.AutoSize = true; this.LabelLengh.AutoSize = true;
this.LabelLengh.Location = new System.Drawing.Point(14, 60); this.LabelLengh.Location = new System.Drawing.Point(19, 74);
this.LabelLengh.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LabelLengh.Name = "LabelLengh"; this.LabelLengh.Name = "LabelLengh";
this.LabelLengh.Size = new System.Drawing.Size(136, 13); this.LabelLengh.Size = new System.Drawing.Size(167, 17);
this.LabelLengh.TabIndex = 1; this.LabelLengh.TabIndex = 1;
this.LabelLengh.Text = "Длительность: 35 секунд"; this.LabelLengh.Text = "Длительность: 0 секунд";
// //
// LabelName // LabelName
// //
this.LabelName.AutoSize = true; this.LabelName.AutoSize = true;
this.LabelName.Location = new System.Drawing.Point(14, 86); this.LabelName.Location = new System.Drawing.Point(19, 106);
this.LabelName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LabelName.Name = "LabelName"; this.LabelName.Name = "LabelName";
this.LabelName.Size = new System.Drawing.Size(60, 13); this.LabelName.Size = new System.Drawing.Size(76, 17);
this.LabelName.TabIndex = 2; this.LabelName.TabIndex = 2;
this.LabelName.Text = "Название:"; this.LabelName.Text = "Название:";
// //
// nazvanieTextBox // nazvanieTextBox
// //
this.nazvanieTextBox.Location = new System.Drawing.Point(80, 86); this.nazvanieTextBox.Location = new System.Drawing.Point(107, 106);
this.nazvanieTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.nazvanieTextBox.Name = "nazvanieTextBox"; this.nazvanieTextBox.Name = "nazvanieTextBox";
this.nazvanieTextBox.Size = new System.Drawing.Size(138, 20); this.nazvanieTextBox.Size = new System.Drawing.Size(183, 22);
this.nazvanieTextBox.TabIndex = 3; this.nazvanieTextBox.TabIndex = 3;
// //
// leftPanel // leftPanel
@ -120,34 +124,38 @@ namespace WindowsFormsApplication1
this.leftPanel.Controls.Add(this.LabelName); this.leftPanel.Controls.Add(this.LabelName);
this.leftPanel.Dock = System.Windows.Forms.DockStyle.Left; this.leftPanel.Dock = System.Windows.Forms.DockStyle.Left;
this.leftPanel.Location = new System.Drawing.Point(0, 0); this.leftPanel.Location = new System.Drawing.Point(0, 0);
this.leftPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.leftPanel.Name = "leftPanel"; this.leftPanel.Name = "leftPanel";
this.leftPanel.Size = new System.Drawing.Size(297, 380); this.leftPanel.Size = new System.Drawing.Size(396, 468);
this.leftPanel.TabIndex = 4; this.leftPanel.TabIndex = 4;
// //
// Char_Stats // Char_Stats
// //
this.Char_Stats.AutoSize = true; this.Char_Stats.AutoSize = true;
this.Char_Stats.Location = new System.Drawing.Point(14, 274); this.Char_Stats.Location = new System.Drawing.Point(19, 337);
this.Char_Stats.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.Char_Stats.Name = "Char_Stats"; this.Char_Stats.Name = "Char_Stats";
this.Char_Stats.Size = new System.Drawing.Size(259, 13); this.Char_Stats.Size = new System.Drawing.Size(344, 17);
this.Char_Stats.TabIndex = 24; this.Char_Stats.TabIndex = 24;
this.Char_Stats.Text = "number name state view delete"; this.Char_Stats.Text = "number name state view delete";
// //
// Char_Info // Char_Info
// //
this.Char_Info.AutoSize = true; this.Char_Info.AutoSize = true;
this.Char_Info.Location = new System.Drawing.Point(44, 232); this.Char_Info.Location = new System.Drawing.Point(59, 286);
this.Char_Info.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.Char_Info.Name = "Char_Info"; this.Char_Info.Name = "Char_Info";
this.Char_Info.Size = new System.Drawing.Size(180, 13); this.Char_Info.Size = new System.Drawing.Size(229, 17);
this.Char_Info.TabIndex = 23; this.Char_Info.TabIndex = 23;
this.Char_Info.Text = "ИНФОРМАЦИЯ О ПЕРСОНАЖАХ"; this.Char_Info.Text = "ИНФОРМАЦИЯ О ПЕРСОНАЖАХ";
this.Char_Info.Click += new System.EventHandler(this.Char_Info_Click); this.Char_Info.Click += new System.EventHandler(this.Char_Info_Click);
// //
// PictureBoxBackground // PictureBoxBackground
// //
this.PictureBoxBackground.Location = new System.Drawing.Point(16, 158); this.PictureBoxBackground.Location = new System.Drawing.Point(21, 194);
this.PictureBoxBackground.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.PictureBoxBackground.Name = "PictureBoxBackground"; this.PictureBoxBackground.Name = "PictureBoxBackground";
this.PictureBoxBackground.Size = new System.Drawing.Size(117, 72); this.PictureBoxBackground.Size = new System.Drawing.Size(156, 89);
this.PictureBoxBackground.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.PictureBoxBackground.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.PictureBoxBackground.TabIndex = 12; this.PictureBoxBackground.TabIndex = 12;
this.PictureBoxBackground.TabStop = false; this.PictureBoxBackground.TabStop = false;
@ -155,17 +163,19 @@ namespace WindowsFormsApplication1
// LabelBackground // LabelBackground
// //
this.LabelBackground.AutoSize = true; this.LabelBackground.AutoSize = true;
this.LabelBackground.Location = new System.Drawing.Point(14, 114); this.LabelBackground.Location = new System.Drawing.Point(19, 140);
this.LabelBackground.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LabelBackground.Name = "LabelBackground"; this.LabelBackground.Name = "LabelBackground";
this.LabelBackground.Size = new System.Drawing.Size(77, 13); this.LabelBackground.Size = new System.Drawing.Size(100, 17);
this.LabelBackground.TabIndex = 11; this.LabelBackground.TabIndex = 11;
this.LabelBackground.Text = "Выбрать фон:"; this.LabelBackground.Text = "Выбрать фон:";
// //
// dobavitFonButton // dobavitFonButton
// //
this.dobavitFonButton.Location = new System.Drawing.Point(17, 130); this.dobavitFonButton.Location = new System.Drawing.Point(23, 160);
this.dobavitFonButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dobavitFonButton.Name = "dobavitFonButton"; this.dobavitFonButton.Name = "dobavitFonButton";
this.dobavitFonButton.Size = new System.Drawing.Size(116, 24); this.dobavitFonButton.Size = new System.Drawing.Size(155, 30);
this.dobavitFonButton.TabIndex = 10; this.dobavitFonButton.TabIndex = 10;
this.dobavitFonButton.Text = "Добавить"; this.dobavitFonButton.Text = "Добавить";
this.dobavitFonButton.UseVisualStyleBackColor = true; this.dobavitFonButton.UseVisualStyleBackColor = true;
@ -173,9 +183,10 @@ namespace WindowsFormsApplication1
// //
// splitter1 // splitter1
// //
this.splitter1.Location = new System.Drawing.Point(297, 0); this.splitter1.Location = new System.Drawing.Point(396, 0);
this.splitter1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitter1.Name = "splitter1"; this.splitter1.Name = "splitter1";
this.splitter1.Size = new System.Drawing.Size(3, 380); this.splitter1.Size = new System.Drawing.Size(4, 468);
this.splitter1.TabIndex = 5; this.splitter1.TabIndex = 5;
this.splitter1.TabStop = false; this.splitter1.TabStop = false;
// //
@ -186,17 +197,19 @@ namespace WindowsFormsApplication1
this.rightPanel.Controls.Add(this.SaveMultButton); this.rightPanel.Controls.Add(this.SaveMultButton);
this.rightPanel.Controls.Add(this.ButtonAddChar); this.rightPanel.Controls.Add(this.ButtonAddChar);
this.rightPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.rightPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.rightPanel.Location = new System.Drawing.Point(300, 0); this.rightPanel.Location = new System.Drawing.Point(400, 0);
this.rightPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.rightPanel.Name = "rightPanel"; this.rightPanel.Name = "rightPanel";
this.rightPanel.Size = new System.Drawing.Size(377, 380); this.rightPanel.Size = new System.Drawing.Size(503, 468);
this.rightPanel.TabIndex = 6; this.rightPanel.TabIndex = 6;
// //
// SaveCharButton // SaveCharButton
// //
this.SaveCharButton.Dock = System.Windows.Forms.DockStyle.Bottom; this.SaveCharButton.Dock = System.Windows.Forms.DockStyle.Bottom;
this.SaveCharButton.Location = new System.Drawing.Point(0, 320); this.SaveCharButton.Location = new System.Drawing.Point(0, 394);
this.SaveCharButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.SaveCharButton.Name = "SaveCharButton"; this.SaveCharButton.Name = "SaveCharButton";
this.SaveCharButton.Size = new System.Drawing.Size(377, 30); this.SaveCharButton.Size = new System.Drawing.Size(503, 37);
this.SaveCharButton.TabIndex = 3; this.SaveCharButton.TabIndex = 3;
this.SaveCharButton.Text = "Сохранить персонажа"; this.SaveCharButton.Text = "Сохранить персонажа";
this.SaveCharButton.UseVisualStyleBackColor = true; this.SaveCharButton.UseVisualStyleBackColor = true;
@ -205,6 +218,8 @@ namespace WindowsFormsApplication1
// personPanel // personPanel
// //
this.personPanel.Controls.Add(this.charNameBox); this.personPanel.Controls.Add(this.charNameBox);
this.personPanel.Controls.Add(this.circlesTextBox);
this.personPanel.Controls.Add(this.circlesLabel);
this.personPanel.Controls.Add(this.charNameLabel); this.personPanel.Controls.Add(this.charNameLabel);
this.personPanel.Controls.Add(this.openSpace); this.personPanel.Controls.Add(this.openSpace);
this.personPanel.Controls.Add(this.SpriteNumberLabel); this.personPanel.Controls.Add(this.SpriteNumberLabel);
@ -222,35 +237,55 @@ namespace WindowsFormsApplication1
this.personPanel.Controls.Add(this.ComboBoxMove); this.personPanel.Controls.Add(this.ComboBoxMove);
this.personPanel.Controls.Add(this.LabelMoveType); this.personPanel.Controls.Add(this.LabelMoveType);
this.personPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.personPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.personPanel.Location = new System.Drawing.Point(0, 26); this.personPanel.Location = new System.Drawing.Point(0, 32);
this.personPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.personPanel.Name = "personPanel"; this.personPanel.Name = "personPanel";
this.personPanel.Size = new System.Drawing.Size(377, 324); this.personPanel.Size = new System.Drawing.Size(503, 399);
this.personPanel.TabIndex = 2; this.personPanel.TabIndex = 2;
this.personPanel.Visible = false; this.personPanel.Visible = false;
this.panel3.Paint += new System.Windows.Forms.PaintEventHandler(this.panel3_Paint);
// //
// charNameBox // charNameBox
// //
this.charNameBox.Location = new System.Drawing.Point(85, 88); this.charNameBox.Location = new System.Drawing.Point(113, 108);
this.charNameBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.charNameBox.Name = "charNameBox"; this.charNameBox.Name = "charNameBox";
this.charNameBox.Size = new System.Drawing.Size(138, 20); this.charNameBox.Size = new System.Drawing.Size(183, 22);
this.charNameBox.TabIndex = 19; this.charNameBox.TabIndex = 19;
this.charNameBox.TextChanged += new System.EventHandler(this.charNameBox_TextChanged); //
// circlesTextBox
//
this.circlesTextBox.Location = new System.Drawing.Point(113, 140);
this.circlesTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.circlesTextBox.Name = "circlesTextBox";
this.circlesTextBox.Size = new System.Drawing.Size(183, 22);
this.circlesTextBox.TabIndex = 21;
//
// circlesLabel
//
this.circlesLabel.AutoSize = true;
this.circlesLabel.Location = new System.Drawing.Point(5, 140);
this.circlesLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.circlesLabel.Name = "circlesLabel";
this.circlesLabel.Size = new System.Drawing.Size(103, 17);
this.circlesLabel.TabIndex = 20;
this.circlesLabel.Text = "Кол-во кругов:";
// //
// charNameLabel // charNameLabel
// //
this.charNameLabel.AutoSize = true; this.charNameLabel.AutoSize = true;
this.charNameLabel.Location = new System.Drawing.Point(19, 88); this.charNameLabel.Location = new System.Drawing.Point(25, 108);
this.charNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.charNameLabel.Name = "charNameLabel"; this.charNameLabel.Name = "charNameLabel";
this.charNameLabel.Size = new System.Drawing.Size(60, 13); this.charNameLabel.Size = new System.Drawing.Size(76, 17);
this.charNameLabel.TabIndex = 18; this.charNameLabel.TabIndex = 18;
this.charNameLabel.Text = "Название:"; this.charNameLabel.Text = "Название:";
// //
// openSpace // openSpace
// //
this.openSpace.Location = new System.Drawing.Point(185, 193); this.openSpace.Location = new System.Drawing.Point(247, 238);
this.openSpace.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.openSpace.Name = "openSpace"; this.openSpace.Name = "openSpace";
this.openSpace.Size = new System.Drawing.Size(186, 72); this.openSpace.Size = new System.Drawing.Size(248, 89);
this.openSpace.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.openSpace.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.openSpace.TabIndex = 17; this.openSpace.TabIndex = 17;
this.openSpace.TabStop = false; this.openSpace.TabStop = false;
@ -258,24 +293,27 @@ namespace WindowsFormsApplication1
// SpriteNumberLabel // SpriteNumberLabel
// //
this.SpriteNumberLabel.AutoSize = true; this.SpriteNumberLabel.AutoSize = true;
this.SpriteNumberLabel.Location = new System.Drawing.Point(4, 157); this.SpriteNumberLabel.Location = new System.Drawing.Point(5, 193);
this.SpriteNumberLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.SpriteNumberLabel.Name = "SpriteNumberLabel"; this.SpriteNumberLabel.Name = "SpriteNumberLabel";
this.SpriteNumberLabel.Size = new System.Drawing.Size(119, 13); this.SpriteNumberLabel.Size = new System.Drawing.Size(155, 17);
this.SpriteNumberLabel.TabIndex = 16; this.SpriteNumberLabel.TabIndex = 16;
this.SpriteNumberLabel.Text = "Количество спрайтов:"; this.SpriteNumberLabel.Text = "Количество спрайтов:";
// //
// SpriteNumberTextBox // SpriteNumberTextBox
// //
this.SpriteNumberTextBox.Location = new System.Drawing.Point(7, 173); this.SpriteNumberTextBox.Location = new System.Drawing.Point(9, 213);
this.SpriteNumberTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.SpriteNumberTextBox.Name = "SpriteNumberTextBox"; this.SpriteNumberTextBox.Name = "SpriteNumberTextBox";
this.SpriteNumberTextBox.Size = new System.Drawing.Size(83, 20); this.SpriteNumberTextBox.Size = new System.Drawing.Size(109, 22);
this.SpriteNumberTextBox.TabIndex = 15; this.SpriteNumberTextBox.TabIndex = 15;
// //
// OpenButton // OpenButton
// //
this.OpenButton.Location = new System.Drawing.Point(185, 157); this.OpenButton.Location = new System.Drawing.Point(247, 193);
this.OpenButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.OpenButton.Name = "OpenButton"; this.OpenButton.Name = "OpenButton";
this.OpenButton.Size = new System.Drawing.Size(192, 30); this.OpenButton.Size = new System.Drawing.Size(256, 37);
this.OpenButton.TabIndex = 14; this.OpenButton.TabIndex = 14;
this.OpenButton.Text = "Открыть персонажа"; this.OpenButton.Text = "Открыть персонажа";
this.OpenButton.UseVisualStyleBackColor = true; this.OpenButton.UseVisualStyleBackColor = true;
@ -284,77 +322,85 @@ namespace WindowsFormsApplication1
// LabelPic // LabelPic
// //
this.LabelPic.AutoSize = true; this.LabelPic.AutoSize = true;
this.LabelPic.Location = new System.Drawing.Point(126, 157); this.LabelPic.Location = new System.Drawing.Point(168, 193);
this.LabelPic.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LabelPic.Name = "LabelPic"; this.LabelPic.Name = "LabelPic";
this.LabelPic.Size = new System.Drawing.Size(58, 13); this.LabelPic.Size = new System.Drawing.Size(75, 17);
this.LabelPic.TabIndex = 12; this.LabelPic.TabIndex = 12;
this.LabelPic.Text = "Картинка:"; this.LabelPic.Text = "Картинка:";
// //
// LabelTime // LabelTime
// //
this.LabelTime.AutoSize = true; this.LabelTime.AutoSize = true;
this.LabelTime.Location = new System.Drawing.Point(19, 64); this.LabelTime.Location = new System.Drawing.Point(25, 79);
this.LabelTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LabelTime.Name = "LabelTime"; this.LabelTime.Name = "LabelTime";
this.LabelTime.Size = new System.Drawing.Size(54, 13); this.LabelTime.Size = new System.Drawing.Size(67, 17);
this.LabelTime.TabIndex = 11; this.LabelTime.TabIndex = 11;
this.LabelTime.Text = "Тайминг:"; this.LabelTime.Text = "Тайминг:";
// //
// LabelDef2 // LabelDef2
// //
this.LabelDef2.AutoSize = true; this.LabelDef2.AutoSize = true;
this.LabelDef2.Location = new System.Drawing.Point(240, 64); this.LabelDef2.Location = new System.Drawing.Point(320, 79);
this.LabelDef2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LabelDef2.Name = "LabelDef2"; this.LabelDef2.Name = "LabelDef2";
this.LabelDef2.Size = new System.Drawing.Size(13, 13); this.LabelDef2.Size = new System.Drawing.Size(18, 17);
this.LabelDef2.TabIndex = 10; this.LabelDef2.TabIndex = 10;
this.LabelDef2.Text = "--"; this.LabelDef2.Text = "--";
// //
// LabelDef1 // LabelDef1
// //
this.LabelDef1.AutoSize = true; this.LabelDef1.AutoSize = true;
this.LabelDef1.Location = new System.Drawing.Point(240, 35); this.LabelDef1.Location = new System.Drawing.Point(320, 43);
this.LabelDef1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LabelDef1.Name = "LabelDef1"; this.LabelDef1.Name = "LabelDef1";
this.LabelDef1.Size = new System.Drawing.Size(13, 13); this.LabelDef1.Size = new System.Drawing.Size(18, 17);
this.LabelDef1.TabIndex = 9; this.LabelDef1.TabIndex = 9;
this.LabelDef1.Text = "--"; this.LabelDef1.Text = "--";
// //
// LabelWalls // LabelWalls
// //
this.LabelWalls.AutoSize = true; this.LabelWalls.AutoSize = true;
this.LabelWalls.Location = new System.Drawing.Point(19, 35); this.LabelWalls.Location = new System.Drawing.Point(25, 43);
this.LabelWalls.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LabelWalls.Name = "LabelWalls"; this.LabelWalls.Name = "LabelWalls";
this.LabelWalls.Size = new System.Drawing.Size(107, 13); this.LabelWalls.Size = new System.Drawing.Size(138, 17);
this.LabelWalls.TabIndex = 8; this.LabelWalls.TabIndex = 8;
this.LabelWalls.Text = "Границы движения:"; this.LabelWalls.Text = "Границы движения:";
// //
// TextBoxTime1 // TextBoxTime1
// //
this.TextBoxTime1.Location = new System.Drawing.Point(132, 61); this.TextBoxTime1.Location = new System.Drawing.Point(176, 75);
this.TextBoxTime1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TextBoxTime1.Name = "TextBoxTime1"; this.TextBoxTime1.Name = "TextBoxTime1";
this.TextBoxTime1.Size = new System.Drawing.Size(100, 20); this.TextBoxTime1.Size = new System.Drawing.Size(132, 22);
this.TextBoxTime1.TabIndex = 5; this.TextBoxTime1.TabIndex = 5;
// //
// TextBoxTime2 // TextBoxTime2
// //
this.TextBoxTime2.Location = new System.Drawing.Point(259, 61); this.TextBoxTime2.Location = new System.Drawing.Point(345, 75);
this.TextBoxTime2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TextBoxTime2.Name = "TextBoxTime2"; this.TextBoxTime2.Name = "TextBoxTime2";
this.TextBoxTime2.Size = new System.Drawing.Size(100, 20); this.TextBoxTime2.Size = new System.Drawing.Size(132, 22);
this.TextBoxTime2.TabIndex = 4; this.TextBoxTime2.TabIndex = 4;
// //
// TextBoxWall2 // TextBoxWall2
// //
this.TextBoxWall2.Location = new System.Drawing.Point(259, 32); this.TextBoxWall2.Location = new System.Drawing.Point(345, 39);
this.TextBoxWall2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TextBoxWall2.Name = "TextBoxWall2"; this.TextBoxWall2.Name = "TextBoxWall2";
this.TextBoxWall2.Size = new System.Drawing.Size(100, 20); this.TextBoxWall2.Size = new System.Drawing.Size(132, 22);
this.TextBoxWall2.TabIndex = 3; this.TextBoxWall2.TabIndex = 3;
this.TextBoxWall2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TextBoxWall1_KeyPress); this.TextBoxWall2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TextBoxWall1_KeyPress);
// //
// TextBoxWall1 // TextBoxWall1
// //
this.TextBoxWall1.Location = new System.Drawing.Point(132, 32); this.TextBoxWall1.Location = new System.Drawing.Point(176, 39);
this.TextBoxWall1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.TextBoxWall1.Name = "TextBoxWall1"; this.TextBoxWall1.Name = "TextBoxWall1";
this.TextBoxWall1.Size = new System.Drawing.Size(100, 20); this.TextBoxWall1.Size = new System.Drawing.Size(132, 22);
this.TextBoxWall1.TabIndex = 2; this.TextBoxWall1.TabIndex = 2;
this.TextBoxWall1.TextChanged += new System.EventHandler(this.TextBoxWall1_TextChanged);
this.TextBoxWall1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TextBoxWall1_KeyPress); this.TextBoxWall1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TextBoxWall1_KeyPress);
// //
// ComboBoxMove // ComboBoxMove
@ -365,9 +411,10 @@ namespace WindowsFormsApplication1
"Диагонально", "Диагонально",
"Волнами", "Волнами",
"Кругами"}); "Кругами"});
this.ComboBoxMove.Location = new System.Drawing.Point(111, 3); this.ComboBoxMove.Location = new System.Drawing.Point(148, 4);
this.ComboBoxMove.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ComboBoxMove.Name = "ComboBoxMove"; this.ComboBoxMove.Name = "ComboBoxMove";
this.ComboBoxMove.Size = new System.Drawing.Size(121, 21); this.ComboBoxMove.Size = new System.Drawing.Size(160, 24);
this.ComboBoxMove.TabIndex = 1; this.ComboBoxMove.TabIndex = 1;
this.ComboBoxMove.Text = "Прямо"; this.ComboBoxMove.Text = "Прямо";
this.ComboBoxMove.SelectedIndexChanged += new System.EventHandler(this.ComboBoxMove_SelectedIndexChanged); this.ComboBoxMove.SelectedIndexChanged += new System.EventHandler(this.ComboBoxMove_SelectedIndexChanged);
@ -375,18 +422,20 @@ namespace WindowsFormsApplication1
// LabelMoveType // LabelMoveType
// //
this.LabelMoveType.AutoSize = true; this.LabelMoveType.AutoSize = true;
this.LabelMoveType.Location = new System.Drawing.Point(23, 3); this.LabelMoveType.Location = new System.Drawing.Point(31, 4);
this.LabelMoveType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LabelMoveType.Name = "LabelMoveType"; this.LabelMoveType.Name = "LabelMoveType";
this.LabelMoveType.Size = new System.Drawing.Size(82, 13); this.LabelMoveType.Size = new System.Drawing.Size(105, 17);
this.LabelMoveType.TabIndex = 0; this.LabelMoveType.TabIndex = 0;
this.LabelMoveType.Text = "Вид движения:"; this.LabelMoveType.Text = "Вид движения:";
// //
// SaveMultButton // SaveMultButton
// //
this.SaveMultButton.Dock = System.Windows.Forms.DockStyle.Bottom; this.SaveMultButton.Dock = System.Windows.Forms.DockStyle.Bottom;
this.SaveMultButton.Location = new System.Drawing.Point(0, 350); this.SaveMultButton.Location = new System.Drawing.Point(0, 431);
this.SaveMultButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.SaveMultButton.Name = "SaveMultButton"; this.SaveMultButton.Name = "SaveMultButton";
this.SaveMultButton.Size = new System.Drawing.Size(377, 30); this.SaveMultButton.Size = new System.Drawing.Size(503, 37);
this.SaveMultButton.TabIndex = 1; this.SaveMultButton.TabIndex = 1;
this.SaveMultButton.Text = "Сохранить мульт"; this.SaveMultButton.Text = "Сохранить мульт";
this.SaveMultButton.UseVisualStyleBackColor = true; this.SaveMultButton.UseVisualStyleBackColor = true;
@ -396,8 +445,9 @@ namespace WindowsFormsApplication1
// //
this.ButtonAddChar.Dock = System.Windows.Forms.DockStyle.Top; this.ButtonAddChar.Dock = System.Windows.Forms.DockStyle.Top;
this.ButtonAddChar.Location = new System.Drawing.Point(0, 0); this.ButtonAddChar.Location = new System.Drawing.Point(0, 0);
this.ButtonAddChar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ButtonAddChar.Name = "ButtonAddChar"; this.ButtonAddChar.Name = "ButtonAddChar";
this.ButtonAddChar.Size = new System.Drawing.Size(377, 26); this.ButtonAddChar.Size = new System.Drawing.Size(503, 32);
this.ButtonAddChar.TabIndex = 0; this.ButtonAddChar.TabIndex = 0;
this.ButtonAddChar.Text = "Добавить персонажа"; this.ButtonAddChar.Text = "Добавить персонажа";
this.ButtonAddChar.UseVisualStyleBackColor = true; this.ButtonAddChar.UseVisualStyleBackColor = true;
@ -407,32 +457,15 @@ namespace WindowsFormsApplication1
// //
this.openFileDialog1.FileName = "openFileDialog1"; this.openFileDialog1.FileName = "openFileDialog1";
// //
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(85, 114);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(138, 20);
this.textBox1.TabIndex = 21;
this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(4, 114);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(81, 13);
this.label2.TabIndex = 20;
this.label2.Text = "Кол-во кругов:";
this.label2.Click += new System.EventHandler(this.label2_Click);
//
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(677, 380); this.ClientSize = new System.Drawing.Size(903, 468);
this.Controls.Add(this.rightPanel); this.Controls.Add(this.rightPanel);
this.Controls.Add(this.splitter1); this.Controls.Add(this.splitter1);
this.Controls.Add(this.leftPanel); this.Controls.Add(this.leftPanel);
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "MainForm"; this.Name = "MainForm";
this.RightToLeftLayout = true; this.RightToLeftLayout = true;
this.Text = "Свойства персонажа"; this.Text = "Свойства персонажа";
@ -485,7 +518,7 @@ namespace WindowsFormsApplication1
private System.Windows.Forms.Label Char_Stats; private System.Windows.Forms.Label Char_Stats;
private System.Windows.Forms.TextBox charNameBox; private System.Windows.Forms.TextBox charNameBox;
private System.Windows.Forms.Label charNameLabel; private System.Windows.Forms.Label charNameLabel;
private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox circlesTextBox;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label circlesLabel;
} }
} }

View file

@ -121,7 +121,7 @@ namespace WindowsFormsApplication1
persons[nomerPersa].moveside = ComboBoxMove.Text; persons[nomerPersa].moveside = ComboBoxMove.Text;
persons[nomerPersa].nomer = nomerPersa; persons[nomerPersa].nomer = nomerPersa;
persons[nomerPersa].charname = charNameBox.Text; persons[nomerPersa].charname = charNameBox.Text;
persons[nomerPersa].circles = textBox1.Text; persons[nomerPersa].circles = circlesTextBox.Text;
persons[nomerPersa].l2.Text = charNameBox.Text; persons[nomerPersa].l2.Text = charNameBox.Text;
String[] coordinatyNachala = TextBoxWall1.Text.Split(new String[] { "," }, StringSplitOptions.None); String[] coordinatyNachala = TextBoxWall1.Text.Split(new String[] { "," }, StringSplitOptions.None);
@ -166,7 +166,7 @@ namespace WindowsFormsApplication1
} }
persons[pNomer].charname = charNameBox.Text; persons[pNomer].charname = charNameBox.Text;
persons[pNomer].circles = textBox1.Text; persons[pNomer].circles = circlesTextBox.Text;
persons[pNomer].l2.Text = charNameBox.Text; persons[pNomer].l2.Text = charNameBox.Text;
} }
@ -312,7 +312,7 @@ namespace WindowsFormsApplication1
} }
else if (persons[nomer].moveside == "Волнами") else if (persons[nomer].moveside == "Волнами")
{ {
Sinus.MovePerson(filename, Person.PersonName(nomer)); Sinus.MovePerson(filename, Person.PersonName(nomer), persons[nomer]);
} }
else if (persons[nomer].moveside == "Кругами") else if (persons[nomer].moveside == "Кругами")
{ {
@ -346,7 +346,7 @@ namespace WindowsFormsApplication1
ComboBoxMove.Text = persons[nomer].moveside; ComboBoxMove.Text = persons[nomer].moveside;
pNomer = persons[nomer].nomer; pNomer = persons[nomer].nomer;
charNameBox.Text = persons[nomer].charname; charNameBox.Text = persons[nomer].charname;
textBox1.Text = persons[nomer].circles; circlesTextBox.Text = persons[nomer].circles;
if (!String.IsNullOrEmpty(persons[nomer].adress)) if (!String.IsNullOrEmpty(persons[nomer].adress))
{ {
@ -381,14 +381,8 @@ namespace WindowsFormsApplication1
} }
} }
private void TextBoxWall1_TextChanged(object sender, EventArgs e)
{
}
private void MainForm_Load(object sender, EventArgs e) private void MainForm_Load(object sender, EventArgs e)
{ {
ToolTip tView = new ToolTip(); ToolTip tView = new ToolTip();
tView.IsBalloon = true; tView.IsBalloon = true;
tView.InitialDelay = 0; tView.InitialDelay = 0;
@ -404,41 +398,20 @@ namespace WindowsFormsApplication1
tView2.SetToolTip(TextBoxWall2, "x.y"); tView2.SetToolTip(TextBoxWall2, "x.y");
ComboBoxMove_SelectedIndexChanged(sender, e); ComboBoxMove_SelectedIndexChanged(sender, e);
textBox1_TextChanged(sender, e);
} }
private void ComboBoxMove_SelectedIndexChanged(object sender, EventArgs e) private void ComboBoxMove_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (ComboBoxMove.Text == "Кругами") if (ComboBoxMove.Text == "Кругами")
{ {
textBox1.Visible = true; circlesTextBox.Visible = true;
label2.Visible = true; circlesLabel.Visible = true;
} }
else else
{ {
textBox1.Visible = false; circlesTextBox.Visible = false;
label2.Visible = false; circlesLabel.Visible = false;
} }
} }
private void panel3_Paint(object sender, PaintEventArgs e)
{
}
private void charNameBox_TextChanged(object sender, EventArgs e)
{
}
private void textBox1_TextChanged(object sender, EventArgs e)
{
}
private void label2_Click(object sender, EventArgs e)
{
}
} }
} }