diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index f0b92f9..c077cbe 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -2,13 +2,17 @@ "ExpandedNodes": [ "", "\\admin", +<<<<<<< HEAD <<<<<<< HEAD "\\Cuentas", "\\database", ======= >>>>>>> 24f7b01847ca194a06677fedb9c9f495654c5ce3 +======= + "\\Empleados", +>>>>>>> ae6945f7e474edb1bde1c277c092d25b221e151b "\\Ventas" ], - "SelectedNode": "\\admin\\crud.cs", + "SelectedNode": "\\Empleados\\EditarEmpleado1.cs", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/Empleados/EditarEmpleado1.Designer.cs b/Empleados/EditarEmpleado1.Designer.cs index db179f9..b97a0ea 100644 --- a/Empleados/EditarEmpleado1.Designer.cs +++ b/Empleados/EditarEmpleado1.Designer.cs @@ -367,6 +367,7 @@ this.lbImg.Size = new System.Drawing.Size(99, 29); this.lbImg.TabIndex = 28; this.lbImg.Text = "Imagen:"; + this.lbImg.Click += new System.EventHandler(this.lbImg_Click); // // button1 // diff --git a/Empleados/EditarEmpleado1.cs b/Empleados/EditarEmpleado1.cs index 15583d1..27e32cf 100644 --- a/Empleados/EditarEmpleado1.cs +++ b/Empleados/EditarEmpleado1.cs @@ -144,5 +144,10 @@ namespace compabetov2.Empleados { } + + private void lbImg_Click(object sender, EventArgs e) + { + + } } } diff --git a/admin/crud.cs b/admin/crud.cs index 1f31d81..d46de24 100644 --- a/admin/crud.cs +++ b/admin/crud.cs @@ -90,7 +90,9 @@ namespace compabetov2.admin btnEditar.Dock = DockStyle.Fill; btnEditar.Click += new EventHandler(delegate (object sender, EventArgs e) { - + editar editar = new editar(producto, this); + editar.Owner = this; + editar.Show(); }); Button btnVariante = new Button(); diff --git a/admin/editar.Designer.cs b/admin/editar.Designer.cs index 325abec..9b8e252 100644 --- a/admin/editar.Designer.cs +++ b/admin/editar.Designer.cs @@ -33,7 +33,7 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.textBox2 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); + this.lbImg = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.button1 = new System.Windows.Forms.Button(); @@ -88,24 +88,24 @@ // textBox2 // this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox2.Location = new System.Drawing.Point(333, 388); + this.textBox2.Location = new System.Drawing.Point(608, 299); this.textBox2.Margin = new System.Windows.Forms.Padding(4); this.textBox2.Name = "textBox2"; this.textBox2.Size = new System.Drawing.Size(231, 30); this.textBox2.TabIndex = 9; // - // label3 + // lbImg // - this.label3.AutoSize = true; - this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.ForeColor = System.Drawing.Color.Transparent; - this.label3.Location = new System.Drawing.Point(326, 344); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(119, 29); - this.label3.TabIndex = 10; - this.label3.Text = "Nombres:"; + this.lbImg.AutoSize = true; + this.lbImg.BackColor = System.Drawing.Color.Transparent; + this.lbImg.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbImg.ForeColor = System.Drawing.Color.Transparent; + this.lbImg.Location = new System.Drawing.Point(326, 344); + this.lbImg.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbImg.Name = "lbImg"; + this.lbImg.Size = new System.Drawing.Size(99, 29); + this.lbImg.TabIndex = 10; + this.lbImg.Text = "Imagen:"; // // pictureBox2 // @@ -132,7 +132,7 @@ // button1 // this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button1.Location = new System.Drawing.Point(591, 465); + this.button1.Location = new System.Drawing.Point(333, 388); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(103, 46); this.button1.TabIndex = 30; @@ -153,7 +153,7 @@ this.Controls.Add(this.pictureBox2); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.textBox2); - this.Controls.Add(this.label3); + this.Controls.Add(this.lbImg); this.Controls.Add(this.textBox1); this.Controls.Add(this.label2); this.Controls.Add(this.txtNombre); @@ -162,6 +162,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "editar"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Load += new System.EventHandler(this.editar_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); @@ -176,7 +177,7 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label lbImg; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.Button button1; diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 6796f34..ca772bd 100644 Binary files a/bin/Debug/compabetov2.exe and b/bin/Debug/compabetov2.exe differ diff --git a/bin/Debug/compabetov2.pdb b/bin/Debug/compabetov2.pdb index 68552d3..db30f66 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index 466aec8..e633da0 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -151,4 +151,8 @@ C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.e C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.pdb C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.admin.crud.resources C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.admin.crud.resources +<<<<<<< HEAD C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.admin.editar.resources +======= +C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.admin.editar.resources +>>>>>>> ae6945f7e474edb1bde1c277c092d25b221e151b diff --git a/obj/Debug/compabetov2.exe b/obj/Debug/compabetov2.exe index 6796f34..ca772bd 100644 Binary files a/obj/Debug/compabetov2.exe and b/obj/Debug/compabetov2.exe differ diff --git a/obj/Debug/compabetov2.pdb b/obj/Debug/compabetov2.pdb index 68552d3..db30f66 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ