Merge pull request #34 from IngenerkaTeamCenter/nikpopl-patch-2

сделал красивее строки персонажа

WindowsFormsApplication1/WindowsFormsApplication1/MainForm.Designer.cs

@@ -60,6 +60,7 @@ namespace WindowsFormsApplication1
             this.ButtonAddChar = new System.Windows.Forms.Button();
             this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+            this.label1 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PictureBoxBackground)).BeginInit();
             this.panel2.SuspendLayout();
@@ -104,6 +105,7 @@ namespace WindowsFormsApplication1
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.label13);
             this.panel1.Controls.Add(this.PictureBoxBackground);
             this.panel1.Controls.Add(this.LabelBackground);
@@ -144,6 +146,7 @@ namespace WindowsFormsApplication1
             this.LabelBackground.Size = new System.Drawing.Size(77, 13);
             this.LabelBackground.TabIndex = 11;
             this.LabelBackground.Text = "Выбрать фон:";
+            this.LabelBackground.Click += new System.EventHandler(this.LabelBackground_Click);
             // 
             // dobavitFonButton
             // 
@@ -368,6 +371,16 @@ namespace WindowsFormsApplication1
             // 
             this.openFileDialog1.FileName = "openFileDialog1";
             // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(14, 274);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(259, 13);
+            this.label1.TabIndex = 24;
+            this.label1.Text = "number    name         state             view             delete";
+            this.label1.Click += new System.EventHandler(this.label1_Click);
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -424,5 +437,6 @@ namespace WindowsFormsApplication1
         private System.Windows.Forms.PictureBox PictureBoxBackground;
         private System.Windows.Forms.Label label13;
         private System.Windows.Forms.PictureBox openSpace;
+        private System.Windows.Forms.Label label1;
     }
-}
+}

WindowsFormsApplication1/WindowsFormsApplication1/MainForm.cs

@@ -29,7 +29,7 @@ namespace WindowsFormsApplication1
 
         int yPersa = 300;
         int nomerPersa = 0;
-
+        
         PictureBox[] pic1 = new PictureBox[1000];
 
         public MainForm()
@@ -38,6 +38,8 @@ namespace WindowsFormsApplication1
 
             openFileDialog1.Filter = "Kartinki|*.bmp";
             saveFileDialog1.Filter = "cpp files|*.cpp";
+
+
         }
 
         private void buttonAddCharClick(object sender, EventArgs e)
@@ -49,6 +51,7 @@ namespace WindowsFormsApplication1
         {
             return "per" + nomer.ToString();
         }
+        
 
         private void delete_pics2(string filename, int nomer)
         {
@@ -102,7 +105,7 @@ namespace WindowsFormsApplication1
             persons[nomerPersa].l1.Left = 30;
             persons[nomerPersa].l1.Width = 20;
             persons[nomerPersa].l1.Visible = true;
-            persons[nomerPersa].l1.Text = "1";
+            persons[nomerPersa].l1.Text = nomerPersa.ToString()+1;
             this.panel1.Controls.Add(persons[nomerPersa].l1);
 
             persons[nomerPersa].l2 = new Label();
@@ -110,7 +113,7 @@ namespace WindowsFormsApplication1
             persons[nomerPersa].l2.Left = 60;
             persons[nomerPersa].l2.Width = 60;
             persons[nomerPersa].l2.Visible = true;
-            persons[nomerPersa].l2.Text = "Перс1";
+            persons[nomerPersa].l2.Text = "Перс " + nomerPersa.ToString()+1;
             this.panel1.Controls.Add(persons[nomerPersa].l2);
 
             persons[nomerPersa].l3 = new Label();
@@ -118,7 +121,7 @@ namespace WindowsFormsApplication1
             persons[nomerPersa].l3.Left = 120;
             persons[nomerPersa].l3.Width = 40;
             persons[nomerPersa].l3.Visible = true;
-            persons[nomerPersa].l3.Text = "ocphcghfgh";
+            persons[nomerPersa].l3.Text = "saved";
             this.panel1.Controls.Add(persons[nomerPersa].l3);
 
             persons[nomerPersa].b1 = new Button();
@@ -126,22 +129,35 @@ namespace WindowsFormsApplication1
             persons[nomerPersa].b1.Left = 170;
             persons[nomerPersa].b1.Width = 50;
             persons[nomerPersa].b1.Visible = true;
-            persons[nomerPersa].b1.Text = "R" + nomerPersa.ToString();
+            persons[nomerPersa].b1.Text = "view" + nomerPersa.ToString();
             persons[nomerPersa].b1.MouseClick +=
                 new MouseEventHandler(this.button1_Click_2);
             this.panel1.Controls.Add(persons[nomerPersa].b1);
 
+            ToolTip tView = new ToolTip();
+            tView.IsBalloon = true;
+            tView.InitialDelay = 0;
+            tView.ShowAlways = true;
+            tView.AutoPopDelay = 2000;
+            tView.SetToolTip(persons[nomerPersa].b1, "View/edit person");
+
             persons[nomerPersa].b2 = new Button();
             persons[nomerPersa].b2.Top = yPersa;
             persons[nomerPersa].b2.Left = 230;
             persons[nomerPersa].b2.Width = 50;
             persons[nomerPersa].b2.Visible = true;
-            persons[nomerPersa].b2.Text = "X";
+            persons[nomerPersa].b2.Text = "Del";
             persons[nomerPersa].b2.Click +=
                 new System.EventHandler(this.label13_Click);
             this.panel1.Controls.Add(persons[nomerPersa].b2);
-        
 
+            ToolTip tDelete = new ToolTip();
+            tDelete.IsBalloon = true;
+            tDelete.InitialDelay = 0;
+            tDelete.ShowAlways = true;
+            tDelete.AutoPopDelay = 2000;
+            tDelete.SetToolTip(persons[nomerPersa].b2, "Delete this person");
+        
             persons[nomerPersa].coord = TextBoxWall1.Text;
             persons[nomerPersa].coord2 = TextBoxWall2.Text;
             persons[nomerPersa].nomer = nomerPersa;
@@ -302,6 +318,15 @@ namespace WindowsFormsApplication1
             }
         }
 
+        private void LabelBackground_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void label1_Click(object sender, EventArgs e)
+        {
+        }
+
         private void label13_Click(object sender, EventArgs e)
         {
             this.panel1.Controls.Remove(persons[nomerPersa - 1].l1);

WindowsFormsApplication1/WindowsFormsApplication1/obj/Debug/WindowsFormsApplication1.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-38bfce534dc3c0d959750689d6e2ad74c4628282
+9fcadd9ef444bb25b044c80f8ae2b04d1a041afd

WindowsFormsApplication1/WindowsFormsApplication1/obj/Debug/WindowsFormsApplication1.csproj.FileListAbsolute.txt

@@ -17,3 +17,13 @@ C:\Users\user\Desktop\Overnewing\vst\MultRedactor-master\WindowsFormsApplication
 C:\Users\user\Desktop\Overnewing\vst\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\bin\Debug\WindowsFormsApplication1.exe.config
 C:\Users\user\Desktop\Overnewing\vst\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\bin\Debug\WindowsFormsApplication1.exe
 C:\Users\user\Desktop\Overnewing\vst\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\bin\Debug\WindowsFormsApplication1.pdb
+C:\Users\Инженерка\Desktop\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\bin\Debug\WindowsFormsApplication1.exe.config
+C:\Users\Инженерка\Desktop\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\bin\Debug\WindowsFormsApplication1.exe
+C:\Users\Инженерка\Desktop\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\bin\Debug\WindowsFormsApplication1.pdb
+C:\Users\Инженерка\Desktop\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\obj\Debug\WindowsFormsApplication1.csprojResolveAssemblyReference.cache
+C:\Users\Инженерка\Desktop\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\obj\Debug\WindowsFormsApplication1.MainForm.resources
+C:\Users\Инженерка\Desktop\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\obj\Debug\WindowsFormsApplication1.Properties.Resources.resources
+C:\Users\Инженерка\Desktop\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\obj\Debug\WindowsFormsApplication1.csproj.GenerateResource.Cache
+C:\Users\Инженерка\Desktop\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\obj\Debug\WindowsFormsApplication1.csproj.CoreCompileInputs.cache
+C:\Users\Инженерка\Desktop\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\obj\Debug\WindowsFormsApplication1.exe
+C:\Users\Инженерка\Desktop\MultRedactor-master\WindowsFormsApplication1\WindowsFormsApplication1\obj\Debug\WindowsFormsApplication1.pdb