diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index c9e037b..4cd05bf 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -2,6 +2,6 @@ "ExpandedNodes": [ "" ], - "SelectedNode": "\\login.cs", + "SelectedNode": "\\envios.cs", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/compabetoOG/v17/.wsuo b/.vs/compabetoOG/v17/.wsuo index 20c6f5d..81174d3 100644 Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ diff --git a/ActualizarMerma.Designer.cs b/ActualizarMerma.Designer.cs index 1970c35..7e81d5d 100644 --- a/ActualizarMerma.Designer.cs +++ b/ActualizarMerma.Designer.cs @@ -36,14 +36,16 @@ this.txtDescripcion = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // btnCancelar // this.btnCancelar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancelar.Location = new System.Drawing.Point(483, 340); + this.btnCancelar.Location = new System.Drawing.Point(585, 695); + this.btnCancelar.Margin = new System.Windows.Forms.Padding(4); this.btnCancelar.Name = "btnCancelar"; - this.btnCancelar.Size = new System.Drawing.Size(93, 45); + this.btnCancelar.Size = new System.Drawing.Size(124, 55); this.btnCancelar.TabIndex = 15; this.btnCancelar.Text = "Cancelar"; this.btnCancelar.UseVisualStyleBackColor = true; @@ -51,9 +53,10 @@ // btnAgregar // this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnAgregar.Location = new System.Drawing.Point(375, 340); + this.btnAgregar.Location = new System.Drawing.Point(412, 695); + this.btnAgregar.Margin = new System.Windows.Forms.Padding(4); this.btnAgregar.Name = "btnAgregar"; - this.btnAgregar.Size = new System.Drawing.Size(93, 45); + this.btnAgregar.Size = new System.Drawing.Size(124, 55); this.btnAgregar.TabIndex = 14; this.btnAgregar.Text = "Editar"; this.btnAgregar.UseVisualStyleBackColor = true; @@ -62,68 +65,91 @@ // txtResponsable // this.txtResponsable.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtResponsable.Location = new System.Drawing.Point(241, 10); + this.txtResponsable.Location = new System.Drawing.Point(371, 233); + this.txtResponsable.Margin = new System.Windows.Forms.Padding(4); this.txtResponsable.Name = "txtResponsable"; - this.txtResponsable.Size = new System.Drawing.Size(348, 29); + this.txtResponsable.Size = new System.Drawing.Size(463, 34); this.txtResponsable.TabIndex = 13; // // label3 // this.label3.AutoSize = true; + this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(110, 10); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.ForeColor = System.Drawing.Color.Transparent; + this.label3.Location = new System.Drawing.Point(193, 233); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(126, 24); + this.label3.Size = new System.Drawing.Size(162, 29); this.label3.TabIndex = 12; this.label3.Text = "Responsable:"; // // dtFecha // this.dtFecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dtFecha.Location = new System.Drawing.Point(241, 85); + this.dtFecha.Location = new System.Drawing.Point(371, 314); + this.dtFecha.Margin = new System.Windows.Forms.Padding(4); this.dtFecha.Name = "dtFecha"; - this.dtFecha.Size = new System.Drawing.Size(348, 29); + this.dtFecha.Size = new System.Drawing.Size(463, 34); this.dtFecha.TabIndex = 11; // // txtDescripcion // this.txtDescripcion.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtDescripcion.Location = new System.Drawing.Point(11, 119); - this.txtDescripcion.Margin = new System.Windows.Forms.Padding(2); + this.txtDescripcion.Location = new System.Drawing.Point(198, 423); + this.txtDescripcion.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtDescripcion.Multiline = true; this.txtDescripcion.Name = "txtDescripcion"; - this.txtDescripcion.Size = new System.Drawing.Size(578, 195); + this.txtDescripcion.Size = new System.Drawing.Size(769, 239); this.txtDescripcion.TabIndex = 10; this.txtDescripcion.TextChanged += new System.EventHandler(this.txtDescripcion_TextChanged); // // label2 // this.label2.AutoSize = true; + this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(11, 85); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.ForeColor = System.Drawing.Color.Transparent; + this.label2.Location = new System.Drawing.Point(475, 381); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(115, 24); + this.label2.Size = new System.Drawing.Size(147, 29); this.label2.TabIndex = 9; this.label2.Text = "Descripcion:"; + this.label2.Click += new System.EventHandler(this.label2_Click); // // label1 // this.label1.AutoSize = true; + this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(167, 89); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.ForeColor = System.Drawing.Color.White; + this.label1.Location = new System.Drawing.Point(203, 319); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(69, 24); + this.label1.Size = new System.Drawing.Size(86, 29); this.label1.TabIndex = 8; this.label1.Text = "Fecha:"; // + // label4 + // + this.label4.AutoSize = true; + this.label4.BackColor = System.Drawing.Color.Transparent; + this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label4.ForeColor = System.Drawing.Color.Transparent; + this.label4.Location = new System.Drawing.Point(448, 169); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(193, 29); + this.label4.TabIndex = 16; + this.label4.Text = "Modificar Merma"; + // // ActualizarMerma // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(605, 399); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); + this.BackgroundImage = global::compabetov2.Properties.Resources.Form; + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.ClientSize = new System.Drawing.Size(1102, 776); + this.ControlBox = false; + this.Controls.Add(this.label4); this.Controls.Add(this.btnCancelar); this.Controls.Add(this.btnAgregar); this.Controls.Add(this.txtResponsable); @@ -132,8 +158,10 @@ this.Controls.Add(this.txtDescripcion); this.Controls.Add(this.label2); this.Controls.Add(this.label1); + this.DoubleBuffered = true; + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "ActualizarMerma"; - this.Text = "Modificar Merma"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.ResumeLayout(false); this.PerformLayout(); @@ -149,5 +177,6 @@ private System.Windows.Forms.TextBox txtDescripcion; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label4; } } \ No newline at end of file diff --git a/ActualizarMerma.cs b/ActualizarMerma.cs index 5ec100b..077d9be 100644 --- a/ActualizarMerma.cs +++ b/ActualizarMerma.cs @@ -47,5 +47,10 @@ namespace compabetov2 { } + + private void label2_Click(object sender, EventArgs e) + { + + } } } diff --git a/AgregarEmpleado.Designer.cs b/AgregarEmpleado.Designer.cs index 3486d15..2f73571 100644 --- a/AgregarEmpleado.Designer.cs +++ b/AgregarEmpleado.Designer.cs @@ -29,6 +29,9 @@ private void InitializeComponent() { this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.btnAgregar = new System.Windows.Forms.Button(); + this.btnCancelar = new System.Windows.Forms.Button(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.lbNombre = new System.Windows.Forms.Label(); @@ -66,13 +69,11 @@ this.flowLayoutPanel13 = new System.Windows.Forms.FlowLayoutPanel(); this.label8 = new System.Windows.Forms.Label(); this.cbEstado = new System.Windows.Forms.ComboBox(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.btnAgregar = new System.Windows.Forms.Button(); - this.btnCancelar = new System.Windows.Forms.Button(); this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); this.button1 = new System.Windows.Forms.Button(); this.lbImg = new System.Windows.Forms.Label(); this.tableLayoutPanel1.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); this.flowLayoutPanel3.SuspendLayout(); @@ -86,7 +87,6 @@ this.flowLayoutPanel11.SuspendLayout(); this.flowLayoutPanel12.SuspendLayout(); this.flowLayoutPanel13.SuspendLayout(); - this.tableLayoutPanel3.SuspendLayout(); this.flowLayoutPanel2.SuspendLayout(); this.SuspendLayout(); // @@ -100,23 +100,67 @@ this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 0, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 91.73913F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 8.26087F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 66F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(800, 564); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 81F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1219, 661); this.tableLayoutPanel1.TabIndex = 0; // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.ColumnCount = 3; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 84.94152F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.05848F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 148F)); + this.tableLayoutPanel3.Controls.Add(this.btnAgregar, 1, 0); + this.tableLayoutPanel3.Controls.Add(this.btnCancelar, 2, 0); + this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 583); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 1; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(1211, 74); + this.tableLayoutPanel3.TabIndex = 2; + // + // btnAgregar + // + this.btnAgregar.Dock = System.Windows.Forms.DockStyle.Fill; + this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnAgregar.Location = new System.Drawing.Point(906, 4); + this.btnAgregar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAgregar.Name = "btnAgregar"; + this.btnAgregar.Size = new System.Drawing.Size(152, 66); + this.btnAgregar.TabIndex = 0; + this.btnAgregar.Text = "Agregar"; + this.btnAgregar.UseVisualStyleBackColor = true; + this.btnAgregar.Click += new System.EventHandler(this.btnAgregar_Click_1); + // + // btnCancelar + // + this.btnCancelar.Dock = System.Windows.Forms.DockStyle.Fill; + this.btnCancelar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnCancelar.Location = new System.Drawing.Point(1066, 4); + this.btnCancelar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancelar.Name = "btnCancelar"; + this.btnCancelar.Size = new System.Drawing.Size(141, 66); + this.btnCancelar.TabIndex = 1; + this.btnCancelar.Text = "Cancelar"; + this.btnCancelar.UseVisualStyleBackColor = true; + // // tableLayoutPanel2 // this.tableLayoutPanel2.ColumnCount = 2; this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F)); this.tableLayoutPanel2.Controls.Add(this.flowLayoutPanel1, 0, 0); this.tableLayoutPanel2.Controls.Add(this.flowLayoutPanel3, 1, 0); this.tableLayoutPanel2.Controls.Add(this.flowLayoutPanel4, 0, 1); @@ -130,16 +174,17 @@ this.tableLayoutPanel2.Controls.Add(this.flowLayoutPanel12, 1, 4); this.tableLayoutPanel2.Controls.Add(this.flowLayoutPanel13, 1, 5); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel2.Location = new System.Drawing.Point(4, 4); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 6; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 47.40741F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 52.59259F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 71F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 63F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 55F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(794, 450); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 87F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 78F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 74F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 68F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(1211, 524); this.tableLayoutPanel2.TabIndex = 0; // // flowLayoutPanel1 @@ -148,27 +193,30 @@ this.flowLayoutPanel1.Controls.Add(this.txtNombre); this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 3); + this.flowLayoutPanel1.Location = new System.Drawing.Point(4, 4); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(391, 89); + this.flowLayoutPanel1.Size = new System.Drawing.Size(597, 94); this.flowLayoutPanel1.TabIndex = 0; // // lbNombre // this.lbNombre.AutoSize = true; this.lbNombre.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbNombre.Location = new System.Drawing.Point(3, 0); + this.lbNombre.Location = new System.Drawing.Point(4, 0); + this.lbNombre.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbNombre.Name = "lbNombre"; - this.lbNombre.Size = new System.Drawing.Size(69, 20); + this.lbNombre.Size = new System.Drawing.Size(87, 25); this.lbNombre.TabIndex = 0; this.lbNombre.Text = "Nombre:"; // // txtNombre // this.txtNombre.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtNombre.Location = new System.Drawing.Point(3, 23); + this.txtNombre.Location = new System.Drawing.Point(4, 29); + this.txtNombre.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtNombre.Name = "txtNombre"; - this.txtNombre.Size = new System.Drawing.Size(388, 26); + this.txtNombre.Size = new System.Drawing.Size(516, 30); this.txtNombre.TabIndex = 1; // // flowLayoutPanel3 @@ -177,9 +225,10 @@ this.flowLayoutPanel3.Controls.Add(this.txtApellido); this.flowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel3.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel3.Location = new System.Drawing.Point(400, 3); + this.flowLayoutPanel3.Location = new System.Drawing.Point(609, 4); + this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel3.Name = "flowLayoutPanel3"; - this.flowLayoutPanel3.Size = new System.Drawing.Size(391, 89); + this.flowLayoutPanel3.Size = new System.Drawing.Size(598, 94); this.flowLayoutPanel3.TabIndex = 1; // // lbApellidos @@ -187,9 +236,10 @@ this.lbApellidos.AutoSize = true; this.lbApellidos.Dock = System.Windows.Forms.DockStyle.Top; this.lbApellidos.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbApellidos.Location = new System.Drawing.Point(3, 0); + this.lbApellidos.Location = new System.Drawing.Point(4, 0); + this.lbApellidos.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbApellidos.Name = "lbApellidos"; - this.lbApellidos.Size = new System.Drawing.Size(388, 20); + this.lbApellidos.Size = new System.Drawing.Size(516, 25); this.lbApellidos.TabIndex = 0; this.lbApellidos.Text = "Apellidos:"; this.lbApellidos.Click += new System.EventHandler(this.label1_Click); @@ -197,9 +247,10 @@ // txtApellido // this.txtApellido.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtApellido.Location = new System.Drawing.Point(3, 23); + this.txtApellido.Location = new System.Drawing.Point(4, 29); + this.txtApellido.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtApellido.Name = "txtApellido"; - this.txtApellido.Size = new System.Drawing.Size(388, 26); + this.txtApellido.Size = new System.Drawing.Size(516, 30); this.txtApellido.TabIndex = 1; // // flowLayoutPanel4 @@ -208,9 +259,10 @@ this.flowLayoutPanel4.Controls.Add(this.txtCalle); this.flowLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel4.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel4.Location = new System.Drawing.Point(3, 98); + this.flowLayoutPanel4.Location = new System.Drawing.Point(4, 106); + this.flowLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel4.Name = "flowLayoutPanel4"; - this.flowLayoutPanel4.Size = new System.Drawing.Size(391, 99); + this.flowLayoutPanel4.Size = new System.Drawing.Size(597, 106); this.flowLayoutPanel4.TabIndex = 2; // // lbCalle @@ -218,18 +270,20 @@ this.lbCalle.AutoSize = true; this.lbCalle.Dock = System.Windows.Forms.DockStyle.Top; this.lbCalle.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbCalle.Location = new System.Drawing.Point(3, 0); + this.lbCalle.Location = new System.Drawing.Point(4, 0); + this.lbCalle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCalle.Name = "lbCalle"; - this.lbCalle.Size = new System.Drawing.Size(388, 20); + this.lbCalle.Size = new System.Drawing.Size(516, 25); this.lbCalle.TabIndex = 0; this.lbCalle.Text = "Calle:"; // // txtCalle // this.txtCalle.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtCalle.Location = new System.Drawing.Point(3, 23); + this.txtCalle.Location = new System.Drawing.Point(4, 29); + this.txtCalle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtCalle.Name = "txtCalle"; - this.txtCalle.Size = new System.Drawing.Size(388, 26); + this.txtCalle.Size = new System.Drawing.Size(516, 30); this.txtCalle.TabIndex = 1; // // flowLayoutPanel5 @@ -238,9 +292,10 @@ this.flowLayoutPanel5.Controls.Add(this.txtCp); this.flowLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel5.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel5.Location = new System.Drawing.Point(3, 203); + this.flowLayoutPanel5.Location = new System.Drawing.Point(4, 220); + this.flowLayoutPanel5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel5.Name = "flowLayoutPanel5"; - this.flowLayoutPanel5.Size = new System.Drawing.Size(391, 65); + this.flowLayoutPanel5.Size = new System.Drawing.Size(597, 79); this.flowLayoutPanel5.TabIndex = 3; // // lbCp @@ -248,18 +303,20 @@ this.lbCp.AutoSize = true; this.lbCp.Dock = System.Windows.Forms.DockStyle.Top; this.lbCp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbCp.Location = new System.Drawing.Point(3, 0); + this.lbCp.Location = new System.Drawing.Point(4, 0); + this.lbCp.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCp.Name = "lbCp"; - this.lbCp.Size = new System.Drawing.Size(388, 20); + this.lbCp.Size = new System.Drawing.Size(516, 25); this.lbCp.TabIndex = 0; this.lbCp.Text = "Codigo postal:"; // // txtCp // this.txtCp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtCp.Location = new System.Drawing.Point(3, 23); + this.txtCp.Location = new System.Drawing.Point(4, 29); + this.txtCp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtCp.Name = "txtCp"; - this.txtCp.Size = new System.Drawing.Size(388, 26); + this.txtCp.Size = new System.Drawing.Size(516, 30); this.txtCp.TabIndex = 1; // // flowLayoutPanel6 @@ -268,9 +325,10 @@ this.flowLayoutPanel6.Controls.Add(this.txtNoInt); this.flowLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel6.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel6.Location = new System.Drawing.Point(3, 274); + this.flowLayoutPanel6.Location = new System.Drawing.Point(4, 307); + this.flowLayoutPanel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel6.Name = "flowLayoutPanel6"; - this.flowLayoutPanel6.Size = new System.Drawing.Size(391, 57); + this.flowLayoutPanel6.Size = new System.Drawing.Size(597, 70); this.flowLayoutPanel6.TabIndex = 4; // // label3 @@ -278,18 +336,20 @@ this.label3.AutoSize = true; this.label3.Dock = System.Windows.Forms.DockStyle.Top; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(3, 0); + this.label3.Location = new System.Drawing.Point(4, 0); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(388, 20); + this.label3.Size = new System.Drawing.Size(516, 25); this.label3.TabIndex = 0; this.label3.Text = "Numero Interior:"; // // txtNoInt // this.txtNoInt.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtNoInt.Location = new System.Drawing.Point(3, 23); + this.txtNoInt.Location = new System.Drawing.Point(4, 29); + this.txtNoInt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtNoInt.Name = "txtNoInt"; - this.txtNoInt.Size = new System.Drawing.Size(388, 26); + this.txtNoInt.Size = new System.Drawing.Size(516, 30); this.txtNoInt.TabIndex = 1; // // flowLayoutPanel7 @@ -298,9 +358,10 @@ this.flowLayoutPanel7.Controls.Add(this.dtFechaNac); this.flowLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel7.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel7.Location = new System.Drawing.Point(3, 337); + this.flowLayoutPanel7.Location = new System.Drawing.Point(4, 385); + this.flowLayoutPanel7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel7.Name = "flowLayoutPanel7"; - this.flowLayoutPanel7.Size = new System.Drawing.Size(391, 54); + this.flowLayoutPanel7.Size = new System.Drawing.Size(597, 66); this.flowLayoutPanel7.TabIndex = 5; // // label5 @@ -308,9 +369,10 @@ this.label5.AutoSize = true; this.label5.Dock = System.Windows.Forms.DockStyle.Top; this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(3, 0); + this.label5.Location = new System.Drawing.Point(4, 0); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(388, 20); + this.label5.Size = new System.Drawing.Size(516, 25); this.label5.TabIndex = 0; this.label5.Text = "Fecha de nacimiento:"; // @@ -318,9 +380,10 @@ // this.dtFechaNac.CalendarFont = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.dtFechaNac.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dtFechaNac.Location = new System.Drawing.Point(3, 23); + this.dtFechaNac.Location = new System.Drawing.Point(4, 29); + this.dtFechaNac.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.dtFechaNac.Name = "dtFechaNac"; - this.dtFechaNac.Size = new System.Drawing.Size(388, 26); + this.dtFechaNac.Size = new System.Drawing.Size(516, 30); this.dtFechaNac.TabIndex = 1; // // flowLayoutPanel8 @@ -329,9 +392,10 @@ this.flowLayoutPanel8.Controls.Add(this.txtTelefono); this.flowLayoutPanel8.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel8.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel8.Location = new System.Drawing.Point(3, 397); + this.flowLayoutPanel8.Location = new System.Drawing.Point(4, 459); + this.flowLayoutPanel8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel8.Name = "flowLayoutPanel8"; - this.flowLayoutPanel8.Size = new System.Drawing.Size(391, 50); + this.flowLayoutPanel8.Size = new System.Drawing.Size(597, 61); this.flowLayoutPanel8.TabIndex = 6; // // label7 @@ -339,18 +403,20 @@ this.label7.AutoSize = true; this.label7.Dock = System.Windows.Forms.DockStyle.Top; this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label7.Location = new System.Drawing.Point(3, 0); + this.label7.Location = new System.Drawing.Point(4, 0); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(388, 20); + this.label7.Size = new System.Drawing.Size(95, 25); this.label7.TabIndex = 0; this.label7.Text = "Telefono:"; // // txtTelefono // this.txtTelefono.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtTelefono.Location = new System.Drawing.Point(3, 23); + this.txtTelefono.Location = new System.Drawing.Point(107, 4); + this.txtTelefono.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtTelefono.Name = "txtTelefono"; - this.txtTelefono.Size = new System.Drawing.Size(388, 24); + this.txtTelefono.Size = new System.Drawing.Size(516, 29); this.txtTelefono.TabIndex = 1; // // flowLayoutPanel9 @@ -359,9 +425,10 @@ this.flowLayoutPanel9.Controls.Add(this.txtColonia); this.flowLayoutPanel9.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel9.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel9.Location = new System.Drawing.Point(400, 98); + this.flowLayoutPanel9.Location = new System.Drawing.Point(609, 106); + this.flowLayoutPanel9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel9.Name = "flowLayoutPanel9"; - this.flowLayoutPanel9.Size = new System.Drawing.Size(391, 99); + this.flowLayoutPanel9.Size = new System.Drawing.Size(598, 106); this.flowLayoutPanel9.TabIndex = 7; // // lbColonia @@ -369,18 +436,20 @@ this.lbColonia.AutoSize = true; this.lbColonia.Dock = System.Windows.Forms.DockStyle.Top; this.lbColonia.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbColonia.Location = new System.Drawing.Point(3, 0); + this.lbColonia.Location = new System.Drawing.Point(4, 0); + this.lbColonia.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbColonia.Name = "lbColonia"; - this.lbColonia.Size = new System.Drawing.Size(388, 20); + this.lbColonia.Size = new System.Drawing.Size(516, 25); this.lbColonia.TabIndex = 0; this.lbColonia.Text = "Colonia:"; // // txtColonia // this.txtColonia.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtColonia.Location = new System.Drawing.Point(3, 23); + this.txtColonia.Location = new System.Drawing.Point(4, 29); + this.txtColonia.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtColonia.Name = "txtColonia"; - this.txtColonia.Size = new System.Drawing.Size(388, 26); + this.txtColonia.Size = new System.Drawing.Size(516, 30); this.txtColonia.TabIndex = 1; // // flowLayoutPanel10 @@ -389,9 +458,10 @@ this.flowLayoutPanel10.Controls.Add(this.txtNoExt); this.flowLayoutPanel10.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel10.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel10.Location = new System.Drawing.Point(400, 203); + this.flowLayoutPanel10.Location = new System.Drawing.Point(609, 220); + this.flowLayoutPanel10.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel10.Name = "flowLayoutPanel10"; - this.flowLayoutPanel10.Size = new System.Drawing.Size(391, 65); + this.flowLayoutPanel10.Size = new System.Drawing.Size(598, 79); this.flowLayoutPanel10.TabIndex = 8; // // label2 @@ -399,18 +469,20 @@ this.label2.AutoSize = true; this.label2.Dock = System.Windows.Forms.DockStyle.Top; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(3, 0); + this.label2.Location = new System.Drawing.Point(4, 0); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(388, 20); + this.label2.Size = new System.Drawing.Size(516, 25); this.label2.TabIndex = 0; this.label2.Text = "Numero Exterior:"; // // txtNoExt // this.txtNoExt.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtNoExt.Location = new System.Drawing.Point(3, 23); + this.txtNoExt.Location = new System.Drawing.Point(4, 29); + this.txtNoExt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtNoExt.Name = "txtNoExt"; - this.txtNoExt.Size = new System.Drawing.Size(388, 26); + this.txtNoExt.Size = new System.Drawing.Size(516, 30); this.txtNoExt.TabIndex = 1; // // flowLayoutPanel11 @@ -419,9 +491,10 @@ this.flowLayoutPanel11.Controls.Add(this.txtReferencia); this.flowLayoutPanel11.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel11.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel11.Location = new System.Drawing.Point(400, 274); + this.flowLayoutPanel11.Location = new System.Drawing.Point(609, 307); + this.flowLayoutPanel11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel11.Name = "flowLayoutPanel11"; - this.flowLayoutPanel11.Size = new System.Drawing.Size(391, 57); + this.flowLayoutPanel11.Size = new System.Drawing.Size(598, 70); this.flowLayoutPanel11.TabIndex = 9; // // label4 @@ -429,18 +502,20 @@ this.label4.AutoSize = true; this.label4.Dock = System.Windows.Forms.DockStyle.Top; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(3, 0); + this.label4.Location = new System.Drawing.Point(4, 0); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(388, 20); + this.label4.Size = new System.Drawing.Size(516, 25); this.label4.TabIndex = 0; this.label4.Text = "Referencia:"; // // txtReferencia // this.txtReferencia.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtReferencia.Location = new System.Drawing.Point(3, 23); + this.txtReferencia.Location = new System.Drawing.Point(4, 29); + this.txtReferencia.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtReferencia.Name = "txtReferencia"; - this.txtReferencia.Size = new System.Drawing.Size(388, 26); + this.txtReferencia.Size = new System.Drawing.Size(516, 30); this.txtReferencia.TabIndex = 1; // // flowLayoutPanel12 @@ -449,9 +524,10 @@ this.flowLayoutPanel12.Controls.Add(this.dtFechaCon); this.flowLayoutPanel12.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel12.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel12.Location = new System.Drawing.Point(400, 337); + this.flowLayoutPanel12.Location = new System.Drawing.Point(609, 385); + this.flowLayoutPanel12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel12.Name = "flowLayoutPanel12"; - this.flowLayoutPanel12.Size = new System.Drawing.Size(391, 54); + this.flowLayoutPanel12.Size = new System.Drawing.Size(598, 66); this.flowLayoutPanel12.TabIndex = 10; // // label6 @@ -459,18 +535,20 @@ this.label6.AutoSize = true; this.label6.Dock = System.Windows.Forms.DockStyle.Top; this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(3, 0); + this.label6.Location = new System.Drawing.Point(4, 0); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(388, 20); + this.label6.Size = new System.Drawing.Size(516, 25); this.label6.TabIndex = 0; this.label6.Text = "Fecha de contratacion:"; // // dtFechaCon // this.dtFechaCon.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dtFechaCon.Location = new System.Drawing.Point(3, 23); + this.dtFechaCon.Location = new System.Drawing.Point(4, 29); + this.dtFechaCon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.dtFechaCon.Name = "dtFechaCon"; - this.dtFechaCon.Size = new System.Drawing.Size(388, 26); + this.dtFechaCon.Size = new System.Drawing.Size(516, 30); this.dtFechaCon.TabIndex = 1; // // flowLayoutPanel13 @@ -479,9 +557,10 @@ this.flowLayoutPanel13.Controls.Add(this.cbEstado); this.flowLayoutPanel13.Dock = System.Windows.Forms.DockStyle.Fill; this.flowLayoutPanel13.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel13.Location = new System.Drawing.Point(400, 397); + this.flowLayoutPanel13.Location = new System.Drawing.Point(609, 459); + this.flowLayoutPanel13.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel13.Name = "flowLayoutPanel13"; - this.flowLayoutPanel13.Size = new System.Drawing.Size(391, 50); + this.flowLayoutPanel13.Size = new System.Drawing.Size(598, 61); this.flowLayoutPanel13.TabIndex = 11; // // label8 @@ -489,9 +568,10 @@ this.label8.AutoSize = true; this.label8.Dock = System.Windows.Forms.DockStyle.Top; this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.Location = new System.Drawing.Point(3, 0); + this.label8.Location = new System.Drawing.Point(4, 0); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(388, 18); + this.label8.Size = new System.Drawing.Size(73, 24); this.label8.TabIndex = 0; this.label8.Text = "Estado:"; // @@ -502,52 +582,13 @@ this.cbEstado.Items.AddRange(new object[] { "Activo", "Inactivo"}); - this.cbEstado.Location = new System.Drawing.Point(3, 21); + this.cbEstado.Location = new System.Drawing.Point(85, 4); + this.cbEstado.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbEstado.Name = "cbEstado"; - this.cbEstado.Size = new System.Drawing.Size(388, 26); + this.cbEstado.Size = new System.Drawing.Size(516, 32); this.cbEstado.TabIndex = 1; this.cbEstado.Text = "Activo"; // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.ColumnCount = 3; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 84.94152F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.05848F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 109F)); - this.tableLayoutPanel3.Controls.Add(this.btnAgregar, 1, 0); - this.tableLayoutPanel3.Controls.Add(this.btnCancelar, 2, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 500); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 1; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(794, 61); - this.tableLayoutPanel3.TabIndex = 2; - // - // btnAgregar - // - this.btnAgregar.Dock = System.Windows.Forms.DockStyle.Fill; - this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnAgregar.Location = new System.Drawing.Point(584, 3); - this.btnAgregar.Name = "btnAgregar"; - this.btnAgregar.Size = new System.Drawing.Size(97, 55); - this.btnAgregar.TabIndex = 0; - this.btnAgregar.Text = "Agregar"; - this.btnAgregar.UseVisualStyleBackColor = true; - this.btnAgregar.Click += new System.EventHandler(this.btnAgregar_Click_1); - // - // btnCancelar - // - this.btnCancelar.Dock = System.Windows.Forms.DockStyle.Fill; - this.btnCancelar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancelar.Location = new System.Drawing.Point(687, 3); - this.btnCancelar.Name = "btnCancelar"; - this.btnCancelar.Size = new System.Drawing.Size(104, 55); - this.btnCancelar.TabIndex = 1; - this.btnCancelar.Text = "Cancelar"; - this.btnCancelar.UseVisualStyleBackColor = true; - // // flowLayoutPanel2 // this.flowLayoutPanel2.AutoSize = true; @@ -555,9 +596,10 @@ this.flowLayoutPanel2.Controls.Add(this.button1); this.flowLayoutPanel2.Controls.Add(this.lbImg); this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel2.Location = new System.Drawing.Point(3, 459); + this.flowLayoutPanel2.Location = new System.Drawing.Point(4, 536); + this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.flowLayoutPanel2.Name = "flowLayoutPanel2"; - this.flowLayoutPanel2.Size = new System.Drawing.Size(794, 35); + this.flowLayoutPanel2.Size = new System.Drawing.Size(1211, 39); this.flowLayoutPanel2.TabIndex = 3; this.flowLayoutPanel2.Paint += new System.Windows.Forms.PaintEventHandler(this.flowLayoutPanel2_Paint_1); // @@ -565,9 +607,10 @@ // this.button1.Dock = System.Windows.Forms.DockStyle.Top; this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button1.Location = new System.Drawing.Point(3, 3); + this.button1.Location = new System.Drawing.Point(4, 4); + this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(150, 32); + this.button1.Size = new System.Drawing.Size(200, 39); this.button1.TabIndex = 0; this.button1.Text = "Seleccionar Imagen"; this.button1.UseVisualStyleBackColor = true; @@ -577,25 +620,28 @@ // this.lbImg.AutoSize = true; this.lbImg.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbImg.Location = new System.Drawing.Point(159, 0); + this.lbImg.Location = new System.Drawing.Point(212, 0); + this.lbImg.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbImg.Name = "lbImg"; - this.lbImg.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0); - this.lbImg.Size = new System.Drawing.Size(55, 26); + this.lbImg.Padding = new System.Windows.Forms.Padding(0, 12, 0, 0); + this.lbImg.Size = new System.Drawing.Size(68, 32); this.lbImg.TabIndex = 1; this.lbImg.Text = "Imagen:"; this.lbImg.Click += new System.EventHandler(this.label1_Click_1); // // AgregarEmpleado // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 564); + this.ClientSize = new System.Drawing.Size(1219, 661); this.Controls.Add(this.tableLayoutPanel1); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "AgregarEmpleado"; this.Text = "Agregar Empleado"; this.Load += new System.EventHandler(this.AgregarEmpleado_Load); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); + this.tableLayoutPanel3.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false); this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.PerformLayout(); @@ -621,7 +667,6 @@ this.flowLayoutPanel12.PerformLayout(); this.flowLayoutPanel13.ResumeLayout(false); this.flowLayoutPanel13.PerformLayout(); - this.tableLayoutPanel3.ResumeLayout(false); this.flowLayoutPanel2.ResumeLayout(false); this.flowLayoutPanel2.PerformLayout(); this.ResumeLayout(false); diff --git a/MenuPrincipal.Designer.cs b/MenuPrincipal.Designer.cs index 7a6f203..beb2881 100644 --- a/MenuPrincipal.Designer.cs +++ b/MenuPrincipal.Designer.cs @@ -34,13 +34,13 @@ this.label1 = new System.Windows.Forms.Label(); this.lblfecha = new System.Windows.Forms.Label(); this.lblhora = new System.Windows.Forms.Label(); + this.horafecha = new System.Windows.Forms.Timer(this.components); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.panel2 = new System.Windows.Forms.Panel(); this.pictureBox7 = new System.Windows.Forms.PictureBox(); this.button1 = new System.Windows.Forms.Button(); this.button2 = 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(); this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.pictureBox5 = new System.Windows.Forms.PictureBox(); @@ -48,7 +48,6 @@ this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.horafecha = new System.Windows.Forms.Timer(this.components); this.panel1.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -79,7 +78,7 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1631, 750); + this.panel1.Size = new System.Drawing.Size(1924, 938); this.panel1.TabIndex = 4; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // @@ -133,6 +132,11 @@ this.lblhora.Text = "label1"; this.lblhora.Click += new System.EventHandler(this.lblhora_Click); // + // horafecha + // + this.horafecha.Enabled = true; + this.horafecha.Tick += new System.EventHandler(this.horafecha_Tick); + // // flowLayoutPanel1 // this.flowLayoutPanel1.BackgroundImage = global::compabetov2.Properties.Resources.rec; @@ -140,7 +144,6 @@ this.flowLayoutPanel1.Controls.Add(this.button1); this.flowLayoutPanel1.Controls.Add(this.button2); this.flowLayoutPanel1.Controls.Add(this.button3); - this.flowLayoutPanel1.Controls.Add(this.button4); this.flowLayoutPanel1.Controls.Add(this.button5); this.flowLayoutPanel1.Location = new System.Drawing.Point(-8, -6); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -204,8 +207,8 @@ this.button2.Size = new System.Drawing.Size(312, 114); this.button2.TabIndex = 9; this.button2.Text = "Estadisticas"; - this.button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.button2.UseVisualStyleBackColor = false; + this.button2.Click += new System.EventHandler(this.button2_Click); // // button3 // @@ -224,24 +227,7 @@ this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; - // - // button4 - // - this.button4.BackColor = System.Drawing.Color.Transparent; - this.button4.FlatAppearance.BorderSize = 0; - this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); - this.button4.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.button4.Image = global::compabetov2.Properties.Resources.reportesi; - this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button4.Location = new System.Drawing.Point(3, 623); - this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.button4.Name = "button4"; - this.button4.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); - this.button4.Size = new System.Drawing.Size(312, 114); - this.button4.TabIndex = 11; - this.button4.Text = "Reportes"; - this.button4.UseVisualStyleBackColor = false; + // // button5 // @@ -252,7 +238,7 @@ this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button5.Image = global::compabetov2.Properties.Resources.sesionc; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button5.Location = new System.Drawing.Point(3, 741); + this.button5.Location = new System.Drawing.Point(3, 623); this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button5.Name = "button5"; this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); @@ -334,19 +320,14 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); // - // horafecha - // - this.horafecha.Enabled = true; - this.horafecha.Tick += new System.EventHandler(this.horafecha_Tick); - // // MenuPrincipal // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1631, 750); + this.ClientSize = new System.Drawing.Size(1924, 938); this.Controls.Add(this.panel1); this.IsMdiContainer = true; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "MenuPrincipal"; this.Text = "Menu "; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; @@ -379,7 +360,6 @@ private System.Windows.Forms.PictureBox pictureBox3; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; private System.Windows.Forms.Button button5; private System.Windows.Forms.PictureBox pictureBox7; private System.Windows.Forms.Label lblfecha; diff --git a/MenuPrincipal.cs b/MenuPrincipal.cs index 6950d51..6742d12 100644 --- a/MenuPrincipal.cs +++ b/MenuPrincipal.cs @@ -168,5 +168,12 @@ namespace compabetov2 { } + + private void button2_Click(object sender, EventArgs e) + { + + } + + } } diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 8290a57..efceae2 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -60,6 +60,16 @@ namespace compabetov2.Properties { } } + /// + /// Busca un recurso adaptado de tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Barra { + get { + object obj = ResourceManager.GetObject("Barra", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Busca un recurso adaptado de tipo System.Drawing.Bitmap. /// @@ -140,6 +150,16 @@ namespace compabetov2.Properties { } } + /// + /// Busca un recurso adaptado de tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Form { + get { + object obj = ResourceManager.GetObject("Form", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Busca un recurso adaptado de tipo System.Drawing.Bitmap. /// diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 741cf10..f8e57f5 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -118,21 +118,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\dummy logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Cuadro.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Cuentas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\estadisticasi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Menu.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Barra.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Rectangle 1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -151,6 +154,9 @@ ..\Resources\cua1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Personal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Menui.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,8 +184,8 @@ ..\Resources\LoginOriginal2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Cuentas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\mas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\productoi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,10 +208,10 @@ ..\Resources\reportesi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Personal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mas.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Form.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Resources/Barra.png b/Resources/Barra.png new file mode 100644 index 0000000..5769181 Binary files /dev/null and b/Resources/Barra.png differ diff --git a/Resources/Form.png b/Resources/Form.png new file mode 100644 index 0000000..65702a0 Binary files /dev/null and b/Resources/Form.png differ diff --git a/SqlServerTypes/Loader.cs b/SqlServerTypes/Loader.cs new file mode 100644 index 0000000..ce606cf --- /dev/null +++ b/SqlServerTypes/Loader.cs @@ -0,0 +1,45 @@ +using System; +using System.IO; +using System.Runtime.InteropServices; + +namespace SqlServerTypes +{ + /// + /// Utility methods related to CLR Types for SQL Server + /// + public class Utilities + { + [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] + private static extern IntPtr LoadLibrary(string libname); + + /// + /// Loads the required native assemblies for the current architecture (x86 or x64) + /// + /// + /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications + /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. + /// + public static void LoadNativeAssemblies(string rootApplicationPath) + { + var nativeBinaryPath = IntPtr.Size > 4 + ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") + : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); + + LoadNativeAssembly(nativeBinaryPath, "msvcr120.dll"); + LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial140.dll"); + } + + private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) + { + var path = Path.Combine(nativeBinaryPath, assemblyName); + var ptr = LoadLibrary(path); + if (ptr == IntPtr.Zero) + { + throw new Exception(string.Format( + "Error loading {0} (ErrorCode: {1})", + assemblyName, + Marshal.GetLastWin32Error())); + } + } + } +} \ No newline at end of file diff --git a/SqlServerTypes/readme.htm b/SqlServerTypes/readme.htm new file mode 100644 index 0000000..02d9ac8 --- /dev/null +++ b/SqlServerTypes/readme.htm @@ -0,0 +1,61 @@ + + + + Microsoft.SqlServer.Types + + + +
+

Action required to load native assemblies

+

+ To deploy an application that uses spatial data types to a machine that does not have 'System CLR Types for SQL Server' installed you also need to deploy the native assembly SqlServerSpatial140.dll. Both x86 (32 bit) and x64 (64 bit) versions of this assembly have been added to your project under the SqlServerTypes\x86 and SqlServerTypes\x64 subdirectories. The native assembly msvcr120.dll is also included in case the C++ runtime is not installed. +

+

+ You need to add code to load the correct one of these assemblies at runtime (depending on the current architecture). +

+

ASP.NET Web Sites

+

+ For ASP.NET Web Sites, add the following block of code to the code behind file of the Web Form where you have added Report Viewer Control: +

+    Default.aspx.cs:
+        
+    public partial class _Default : System.Web.UI.Page
+    {
+        static bool _isSqlTypesLoaded = false;
+
+        public _Default()
+        {
+            if (!_isSqlTypesLoaded)
+            {
+                SqlServerTypes.Utilities.LoadNativeAssemblies(Server.MapPath("~"));
+                _isSqlTypesLoaded = true;
+            }
+            
+        }
+    }
+
+

+

ASP.NET Web Applications

+

+ For ASP.NET Web Applications, add the following line of code to the Application_Start method in Global.asax.cs: +

    SqlServerTypes.Utilities.LoadNativeAssemblies(Server.MapPath("~/bin"));
+

+

Desktop Applications

+

+ For desktop applications, add the following line of code to run before any spatial operations are performed: +

    SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
+

+
+ + \ No newline at end of file diff --git a/SqlServerTypes/x64/SqlServerSpatial140.dll b/SqlServerTypes/x64/SqlServerSpatial140.dll new file mode 100644 index 0000000..6e443bf Binary files /dev/null and b/SqlServerTypes/x64/SqlServerSpatial140.dll differ diff --git a/SqlServerTypes/x64/msvcr120.dll b/SqlServerTypes/x64/msvcr120.dll new file mode 100644 index 0000000..67937ce Binary files /dev/null and b/SqlServerTypes/x64/msvcr120.dll differ diff --git a/SqlServerTypes/x86/SqlServerSpatial140.dll b/SqlServerTypes/x86/SqlServerSpatial140.dll new file mode 100644 index 0000000..590a22a Binary files /dev/null and b/SqlServerTypes/x86/SqlServerSpatial140.dll differ diff --git a/SqlServerTypes/x86/msvcr120.dll b/SqlServerTypes/x86/msvcr120.dll new file mode 100644 index 0000000..23447f5 Binary files /dev/null and b/SqlServerTypes/x86/msvcr120.dll differ diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 3fd46b6..7226f65 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 581853a..bf8d2ca 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/compabetov2.csproj b/compabetov2.csproj index 89da5a8..1853e91 100644 --- a/compabetov2.csproj +++ b/compabetov2.csproj @@ -80,6 +80,9 @@ packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + + packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll + @@ -203,6 +206,7 @@ + Form @@ -376,6 +380,21 @@ + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + diff --git a/inventario.Designer.cs b/inventario.Designer.cs index e3b225c..dcae5fb 100644 --- a/inventario.Designer.cs +++ b/inventario.Designer.cs @@ -35,7 +35,6 @@ this.button1 = new System.Windows.Forms.Button(); this.button2 = 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(); this.btnAgregarStock = new System.Windows.Forms.Button(); this.stockPanel = new System.Windows.Forms.FlowLayoutPanel(); @@ -49,10 +48,9 @@ this.lblhora.AutoSize = true; this.lblhora.Font = new System.Drawing.Font("Microsoft Sans Serif", 60F); this.lblhora.ForeColor = System.Drawing.Color.MediumBlue; - this.lblhora.Location = new System.Drawing.Point(700, 7); - this.lblhora.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblhora.Location = new System.Drawing.Point(933, 9); this.lblhora.Name = "lblhora"; - this.lblhora.Size = new System.Drawing.Size(238, 91); + this.lblhora.Size = new System.Drawing.Size(299, 113); this.lblhora.TabIndex = 10; this.lblhora.Text = "Stock"; // @@ -63,29 +61,28 @@ this.flowLayoutPanel1.Controls.Add(this.button1); this.flowLayoutPanel1.Controls.Add(this.button2); this.flowLayoutPanel1.Controls.Add(this.button3); - this.flowLayoutPanel1.Controls.Add(this.button4); this.flowLayoutPanel1.Controls.Add(this.button5); this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(243, 862); + this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); this.flowLayoutPanel1.TabIndex = 8; // // panel2 // this.panel2.BackColor = System.Drawing.Color.Transparent; this.panel2.Controls.Add(this.pictureBox7); - this.panel2.Location = new System.Drawing.Point(2, 2); - this.panel2.Margin = new System.Windows.Forms.Padding(2); + this.panel2.Location = new System.Drawing.Point(3, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(234, 214); + this.panel2.Size = new System.Drawing.Size(312, 263); this.panel2.TabIndex = 8; // // pictureBox7 // this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu; - this.pictureBox7.Location = new System.Drawing.Point(48, 28); - this.pictureBox7.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox7.Location = new System.Drawing.Point(64, 34); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(190, 197); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -101,11 +98,11 @@ this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button1.Image = global::compabetov2.Properties.Resources.Menui1; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(2, 220); - this.button1.Margin = new System.Windows.Forms.Padding(2); + this.button1.Location = new System.Drawing.Point(3, 269); + this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button1.Name = "button1"; - this.button1.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button1.Size = new System.Drawing.Size(234, 93); + this.button1.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button1.Size = new System.Drawing.Size(312, 114); this.button1.TabIndex = 8; this.button1.Text = "Menú"; this.button1.UseVisualStyleBackColor = false; @@ -120,11 +117,11 @@ this.button2.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button2.Image = global::compabetov2.Properties.Resources.estadisticasi; this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button2.Location = new System.Drawing.Point(2, 317); - this.button2.Margin = new System.Windows.Forms.Padding(2); + this.button2.Location = new System.Drawing.Point(3, 387); + this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button2.Name = "button2"; - this.button2.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button2.Size = new System.Drawing.Size(234, 93); + this.button2.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button2.Size = new System.Drawing.Size(312, 114); this.button2.TabIndex = 9; this.button2.Text = "Estadisticas"; this.button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -139,33 +136,15 @@ this.button3.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button3.Image = global::compabetov2.Properties.Resources.productoi; this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button3.Location = new System.Drawing.Point(2, 414); - this.button3.Margin = new System.Windows.Forms.Padding(2); + this.button3.Location = new System.Drawing.Point(3, 505); + this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button3.Name = "button3"; - this.button3.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button3.Size = new System.Drawing.Size(234, 93); + this.button3.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button3.Size = new System.Drawing.Size(312, 114); this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; // - // button4 - // - this.button4.BackColor = System.Drawing.Color.Transparent; - this.button4.FlatAppearance.BorderSize = 0; - this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); - this.button4.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.button4.Image = global::compabetov2.Properties.Resources.reportesi; - this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button4.Location = new System.Drawing.Point(2, 511); - this.button4.Margin = new System.Windows.Forms.Padding(2); - this.button4.Name = "button4"; - this.button4.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button4.Size = new System.Drawing.Size(234, 93); - this.button4.TabIndex = 11; - this.button4.Text = "Reportes"; - this.button4.UseVisualStyleBackColor = false; - // // button5 // this.button5.BackColor = System.Drawing.Color.Transparent; @@ -175,20 +154,21 @@ this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button5.Image = global::compabetov2.Properties.Resources.sesionc; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button5.Location = new System.Drawing.Point(2, 608); - this.button5.Margin = new System.Windows.Forms.Padding(2); + this.button5.Location = new System.Drawing.Point(3, 623); + this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button5.Name = "button5"; - this.button5.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button5.Size = new System.Drawing.Size(234, 93); + this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button5.Size = new System.Drawing.Size(312, 114); this.button5.TabIndex = 12; this.button5.Text = "Salir"; this.button5.UseVisualStyleBackColor = false; // // btnAgregarStock // - this.btnAgregarStock.Location = new System.Drawing.Point(744, 147); + this.btnAgregarStock.Location = new System.Drawing.Point(992, 181); + this.btnAgregarStock.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnAgregarStock.Name = "btnAgregarStock"; - this.btnAgregarStock.Size = new System.Drawing.Size(100, 23); + this.btnAgregarStock.Size = new System.Drawing.Size(133, 28); this.btnAgregarStock.TabIndex = 12; this.btnAgregarStock.Text = "Agregar stock"; this.btnAgregarStock.UseVisualStyleBackColor = true; @@ -196,22 +176,23 @@ // // stockPanel // - this.stockPanel.Location = new System.Drawing.Point(394, 199); + this.stockPanel.Location = new System.Drawing.Point(525, 245); + this.stockPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.stockPanel.Name = "stockPanel"; - this.stockPanel.Size = new System.Drawing.Size(834, 518); + this.stockPanel.Size = new System.Drawing.Size(1112, 638); this.stockPanel.TabIndex = 13; this.stockPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.stockPanel_Paint); // // inventario // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1370, 749); + this.ClientSize = new System.Drawing.Size(1827, 922); this.Controls.Add(this.stockPanel); this.Controls.Add(this.btnAgregarStock); this.Controls.Add(this.lblhora); this.Controls.Add(this.flowLayoutPanel1); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "inventario"; this.Text = "inventario"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; @@ -232,7 +213,6 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; private System.Windows.Forms.Button button5; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.Windows.Forms.Label lblhora; diff --git a/mermas.Designer.cs b/mermas.Designer.cs index 2faa4ff..9042e2a 100644 --- a/mermas.Designer.cs +++ b/mermas.Designer.cs @@ -35,7 +35,6 @@ this.button1 = new System.Windows.Forms.Button(); this.button2 = 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(); this.lblfecha = new System.Windows.Forms.Label(); this.lblhora = new System.Windows.Forms.Label(); @@ -54,29 +53,28 @@ this.flowLayoutPanel1.Controls.Add(this.button1); this.flowLayoutPanel1.Controls.Add(this.button2); this.flowLayoutPanel1.Controls.Add(this.button3); - this.flowLayoutPanel1.Controls.Add(this.button4); this.flowLayoutPanel1.Controls.Add(this.button5); this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, -1); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(243, 862); + this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); this.flowLayoutPanel1.TabIndex = 9; // // panel2 // this.panel2.BackColor = System.Drawing.Color.Transparent; this.panel2.Controls.Add(this.pictureBox7); - this.panel2.Location = new System.Drawing.Point(2, 2); - this.panel2.Margin = new System.Windows.Forms.Padding(2); + this.panel2.Location = new System.Drawing.Point(3, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(234, 214); + this.panel2.Size = new System.Drawing.Size(312, 263); this.panel2.TabIndex = 8; // // pictureBox7 // this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu; - this.pictureBox7.Location = new System.Drawing.Point(48, 28); - this.pictureBox7.Margin = new System.Windows.Forms.Padding(2); + this.pictureBox7.Location = new System.Drawing.Point(64, 34); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(190, 197); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -92,11 +90,11 @@ this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button1.Image = global::compabetov2.Properties.Resources.Menui1; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(2, 220); - this.button1.Margin = new System.Windows.Forms.Padding(2); + this.button1.Location = new System.Drawing.Point(3, 269); + this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button1.Name = "button1"; - this.button1.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button1.Size = new System.Drawing.Size(234, 93); + this.button1.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button1.Size = new System.Drawing.Size(312, 114); this.button1.TabIndex = 8; this.button1.Text = "Menú"; this.button1.UseVisualStyleBackColor = false; @@ -111,11 +109,11 @@ this.button2.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button2.Image = global::compabetov2.Properties.Resources.estadisticasi; this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button2.Location = new System.Drawing.Point(2, 317); - this.button2.Margin = new System.Windows.Forms.Padding(2); + this.button2.Location = new System.Drawing.Point(3, 387); + this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button2.Name = "button2"; - this.button2.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button2.Size = new System.Drawing.Size(234, 93); + this.button2.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button2.Size = new System.Drawing.Size(312, 114); this.button2.TabIndex = 9; this.button2.Text = "Estadisticas"; this.button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -130,33 +128,15 @@ this.button3.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button3.Image = global::compabetov2.Properties.Resources.productoi; this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button3.Location = new System.Drawing.Point(2, 414); - this.button3.Margin = new System.Windows.Forms.Padding(2); + this.button3.Location = new System.Drawing.Point(3, 505); + this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button3.Name = "button3"; - this.button3.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button3.Size = new System.Drawing.Size(234, 93); + this.button3.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button3.Size = new System.Drawing.Size(312, 114); this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; // - // button4 - // - this.button4.BackColor = System.Drawing.Color.Transparent; - this.button4.FlatAppearance.BorderSize = 0; - this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); - this.button4.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.button4.Image = global::compabetov2.Properties.Resources.reportesi; - this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button4.Location = new System.Drawing.Point(2, 511); - this.button4.Margin = new System.Windows.Forms.Padding(2); - this.button4.Name = "button4"; - this.button4.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button4.Size = new System.Drawing.Size(234, 93); - this.button4.TabIndex = 11; - this.button4.Text = "Reportes"; - this.button4.UseVisualStyleBackColor = false; - // // button5 // this.button5.BackColor = System.Drawing.Color.Transparent; @@ -166,11 +146,11 @@ this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button5.Image = global::compabetov2.Properties.Resources.sesionc; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button5.Location = new System.Drawing.Point(2, 608); - this.button5.Margin = new System.Windows.Forms.Padding(2); + this.button5.Location = new System.Drawing.Point(3, 623); + this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button5.Name = "button5"; - this.button5.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button5.Size = new System.Drawing.Size(234, 93); + this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button5.Size = new System.Drawing.Size(312, 114); this.button5.TabIndex = 12; this.button5.Text = "Salir"; this.button5.UseVisualStyleBackColor = false; @@ -180,10 +160,9 @@ this.lblfecha.AutoSize = true; this.lblfecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F); this.lblfecha.ForeColor = System.Drawing.Color.Navy; - this.lblfecha.Location = new System.Drawing.Point(556, 125); - this.lblfecha.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblfecha.Location = new System.Drawing.Point(741, 154); this.lblfecha.Name = "lblfecha"; - this.lblfecha.Size = new System.Drawing.Size(126, 46); + this.lblfecha.Size = new System.Drawing.Size(159, 58); this.lblfecha.TabIndex = 15; this.lblfecha.Text = "label2"; this.lblfecha.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -193,10 +172,9 @@ this.lblhora.AutoSize = true; this.lblhora.Font = new System.Drawing.Font("Microsoft Sans Serif", 60F); this.lblhora.ForeColor = System.Drawing.Color.MediumBlue; - this.lblhora.Location = new System.Drawing.Point(697, 28); - this.lblhora.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblhora.Location = new System.Drawing.Point(929, 34); this.lblhora.Name = "lblhora"; - this.lblhora.Size = new System.Drawing.Size(249, 91); + this.lblhora.Size = new System.Drawing.Size(318, 113); this.lblhora.TabIndex = 14; this.lblhora.Text = "label1"; // @@ -207,18 +185,20 @@ // // mermaPanel // - this.mermaPanel.Location = new System.Drawing.Point(429, 283); + this.mermaPanel.Location = new System.Drawing.Point(572, 348); + this.mermaPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.mermaPanel.Name = "mermaPanel"; - this.mermaPanel.Size = new System.Drawing.Size(779, 402); + this.mermaPanel.Size = new System.Drawing.Size(1039, 495); this.mermaPanel.TabIndex = 16; this.mermaPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.mermaPanel_Paint); // // btnAgregar // this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnAgregar.Location = new System.Drawing.Point(787, 219); + this.btnAgregar.Location = new System.Drawing.Point(1049, 270); + this.btnAgregar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnAgregar.Name = "btnAgregar"; - this.btnAgregar.Size = new System.Drawing.Size(89, 28); + this.btnAgregar.Size = new System.Drawing.Size(119, 34); this.btnAgregar.TabIndex = 17; this.btnAgregar.Text = "Agregar"; this.btnAgregar.UseVisualStyleBackColor = true; @@ -226,15 +206,15 @@ // // mermas // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1370, 749); + this.ClientSize = new System.Drawing.Size(1827, 922); this.Controls.Add(this.btnAgregar); this.Controls.Add(this.mermaPanel); this.Controls.Add(this.lblfecha); this.Controls.Add(this.lblhora); this.Controls.Add(this.flowLayoutPanel1); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "mermas"; this.Text = "mermas"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; @@ -256,7 +236,6 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; private System.Windows.Forms.Button button5; private System.Windows.Forms.Label lblfecha; private System.Windows.Forms.Label lblhora; diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 10a1a65..c30d188 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 248c243..5b08d3c 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index fb0c464..daacd26 100644 Binary files a/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/obj/Debug/compabetov2.Properties.Resources.resources b/obj/Debug/compabetov2.Properties.Resources.resources index 156f192..fd77073 100644 Binary files a/obj/Debug/compabetov2.Properties.Resources.resources and b/obj/Debug/compabetov2.Properties.Resources.resources differ diff --git a/obj/Debug/compabetov2.csproj.AssemblyReference.cache b/obj/Debug/compabetov2.csproj.AssemblyReference.cache index 5093a0c..a853f99 100644 Binary files a/obj/Debug/compabetov2.csproj.AssemblyReference.cache and b/obj/Debug/compabetov2.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache index 65eac95..44c57cd 100644 --- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache +++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e9c2d0de4eef50d120601b2201dac9006ebfce8743c5966fa432f0fa3a615be +58c239bc3e838a0c02c2b5a03d125ff99004200327e2ff69d1038564eb7b7c64 diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index 5cbbf72..c2133f3 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -107,3 +107,9 @@ C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resou C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verMerma.resources +C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll +C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll +C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll +C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll +C:\Users\Googl\Documents\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verproductos.resources diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index dfe2b46..fd4278c 100644 Binary files a/obj/Debug/compabetov2.csproj.GenerateResource.cache and b/obj/Debug/compabetov2.csproj.GenerateResource.cache differ diff --git a/obj/Debug/compabetov2.exe b/obj/Debug/compabetov2.exe index 3fd46b6..7226f65 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 581853a..bf8d2ca 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ diff --git a/packages.config b/packages.config index ee2a7aa..08a580b 100644 --- a/packages.config +++ b/packages.config @@ -1,6 +1,7 @@  + diff --git a/personal.Designer.cs b/personal.Designer.cs index c73a116..86e1be5 100644 --- a/personal.Designer.cs +++ b/personal.Designer.cs @@ -34,10 +34,8 @@ this.button1 = new System.Windows.Forms.Button(); this.button2 = 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(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); this.personalPanel = new System.Windows.Forms.FlowLayoutPanel(); this.lblhora = new System.Windows.Forms.Label(); this.empleadoBindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -127,24 +125,6 @@ this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; // - // button4 - // - this.button4.BackColor = System.Drawing.Color.Transparent; - this.button4.FlatAppearance.BorderSize = 0; - this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); - this.button4.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.button4.Image = global::compabetov2.Properties.Resources.reportesi; - this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button4.Location = new System.Drawing.Point(3, 623); - this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.button4.Name = "button4"; - this.button4.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); - this.button4.Size = new System.Drawing.Size(312, 114); - this.button4.TabIndex = 11; - this.button4.Text = "Reportes"; - this.button4.UseVisualStyleBackColor = false; - // // button5 // this.button5.BackColor = System.Drawing.Color.Transparent; @@ -154,7 +134,7 @@ this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button5.Image = global::compabetov2.Properties.Resources.sesionc; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button5.Location = new System.Drawing.Point(3, 741); + this.button5.Location = new System.Drawing.Point(3, 623); this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button5.Name = "button5"; this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); @@ -170,27 +150,17 @@ this.flowLayoutPanel1.Controls.Add(this.button1); this.flowLayoutPanel1.Controls.Add(this.button2); this.flowLayoutPanel1.Controls.Add(this.button3); - this.flowLayoutPanel1.Controls.Add(this.button4); this.flowLayoutPanel1.Controls.Add(this.button5); - this.flowLayoutPanel1.Controls.Add(this.flowLayoutPanel2); this.flowLayoutPanel1.Location = new System.Drawing.Point(-3, -2); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); this.flowLayoutPanel1.TabIndex = 8; // - // flowLayoutPanel2 - // - this.flowLayoutPanel2.Location = new System.Drawing.Point(4, 861); - this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.flowLayoutPanel2.Name = "flowLayoutPanel2"; - this.flowLayoutPanel2.Size = new System.Drawing.Size(267, 123); - this.flowLayoutPanel2.TabIndex = 13; - // // personalPanel // this.personalPanel.Location = new System.Drawing.Point(460, 308); - this.personalPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.personalPanel.Margin = new System.Windows.Forms.Padding(4); this.personalPanel.Name = "personalPanel"; this.personalPanel.Size = new System.Drawing.Size(1212, 553); this.personalPanel.TabIndex = 9; @@ -219,7 +189,7 @@ // btnAgregar // this.btnAgregar.Location = new System.Drawing.Point(984, 220); - this.btnAgregar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAgregar.Margin = new System.Windows.Forms.Padding(4); this.btnAgregar.Name = "btnAgregar"; this.btnAgregar.Size = new System.Drawing.Size(167, 43); this.btnAgregar.TabIndex = 12; @@ -259,12 +229,10 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; private System.Windows.Forms.Button button5; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.Windows.Forms.BindingSource conexionBindingSource; private System.Windows.Forms.BindingSource empleadoBindingSource; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2; private System.Windows.Forms.FlowLayoutPanel personalPanel; private System.Windows.Forms.Label lblhora; private System.Windows.Forms.Button btnAgregar; diff --git a/vender.Designer.cs b/vender.Designer.cs index 407a812..12980e8 100644 --- a/vender.Designer.cs +++ b/vender.Designer.cs @@ -44,11 +44,9 @@ this.button1 = new System.Windows.Forms.Button(); this.button2 = 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(); this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); + this.txtbusqueda = new System.Windows.Forms.TextBox(); this.bntImprimir = new System.Windows.Forms.Button(); this.responsablecb = new System.Windows.Forms.ComboBox(); this.btnFiar = new System.Windows.Forms.Button(); @@ -70,10 +68,9 @@ this.lblfecha.AutoSize = true; this.lblfecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 30F); this.lblfecha.ForeColor = System.Drawing.Color.Navy; - this.lblfecha.Location = new System.Drawing.Point(370, 85); - this.lblfecha.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblfecha.Location = new System.Drawing.Point(493, 105); this.lblfecha.Name = "lblfecha"; - this.lblfecha.Size = new System.Drawing.Size(126, 46); + this.lblfecha.Size = new System.Drawing.Size(159, 58); this.lblfecha.TabIndex = 13; this.lblfecha.Text = "label2"; this.lblfecha.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -84,10 +81,9 @@ this.lblhora.AutoSize = true; this.lblhora.Font = new System.Drawing.Font("Microsoft Sans Serif", 60F); this.lblhora.ForeColor = System.Drawing.Color.MediumBlue; - this.lblhora.Location = new System.Drawing.Point(511, -11); - this.lblhora.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblhora.Location = new System.Drawing.Point(681, -14); this.lblhora.Name = "lblhora"; - this.lblhora.Size = new System.Drawing.Size(249, 91); + this.lblhora.Size = new System.Drawing.Size(318, 113); this.lblhora.TabIndex = 12; this.lblhora.Text = "label1"; this.lblhora.Click += new System.EventHandler(this.lblhora_Click); @@ -98,10 +94,10 @@ this.flowLayoutPanel2.Controls.Add(this.panel1); this.flowLayoutPanel2.Controls.Add(this.label1); this.flowLayoutPanel2.Controls.Add(this.labeltotal); - this.flowLayoutPanel2.Location = new System.Drawing.Point(1204, -1); - this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.flowLayoutPanel2.Location = new System.Drawing.Point(1605, -1); + this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel2.Name = "flowLayoutPanel2"; - this.flowLayoutPanel2.Size = new System.Drawing.Size(243, 968); + this.flowLayoutPanel2.Size = new System.Drawing.Size(324, 1191); this.flowLayoutPanel2.TabIndex = 11; this.flowLayoutPanel2.Paint += new System.Windows.Forms.PaintEventHandler(this.flowLayoutPanel2_Paint); // @@ -109,17 +105,17 @@ // this.panel1.BackColor = System.Drawing.Color.Transparent; this.panel1.Controls.Add(this.pictureBox9); - this.panel1.Location = new System.Drawing.Point(2, 2); - this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panel1.Location = new System.Drawing.Point(3, 2); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(234, 214); + this.panel1.Size = new System.Drawing.Size(312, 263); this.panel1.TabIndex = 8; // // pictureBox9 // this.pictureBox9.Image = global::compabetov2.Properties.Resources.HomeroMenu; - this.pictureBox9.Location = new System.Drawing.Point(48, 28); - this.pictureBox9.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pictureBox9.Location = new System.Drawing.Point(64, 34); + this.pictureBox9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox9.Name = "pictureBox9"; this.pictureBox9.Size = new System.Drawing.Size(190, 197); this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -132,10 +128,9 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.label1.ForeColor = System.Drawing.Color.AliceBlue; - this.label1.Location = new System.Drawing.Point(2, 218); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Location = new System.Drawing.Point(3, 267); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(83, 31); + this.label1.Size = new System.Drawing.Size(102, 39); this.label1.TabIndex = 17; this.label1.Text = "Total:"; this.label1.Click += new System.EventHandler(this.label1_Click); @@ -146,10 +141,9 @@ this.labeltotal.BackColor = System.Drawing.Color.Transparent; this.labeltotal.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F); this.labeltotal.ForeColor = System.Drawing.Color.AliceBlue; - this.labeltotal.Location = new System.Drawing.Point(89, 218); - this.labeltotal.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.labeltotal.Location = new System.Drawing.Point(111, 267); this.labeltotal.Name = "labeltotal"; - this.labeltotal.Size = new System.Drawing.Size(0, 31); + this.labeltotal.Size = new System.Drawing.Size(0, 39); this.labeltotal.TabIndex = 18; // // flowLayoutPanel1 @@ -159,29 +153,28 @@ this.flowLayoutPanel1.Controls.Add(this.button1); this.flowLayoutPanel1.Controls.Add(this.button2); this.flowLayoutPanel1.Controls.Add(this.button3); - this.flowLayoutPanel1.Controls.Add(this.button4); this.flowLayoutPanel1.Controls.Add(this.button5); this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 0); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(243, 974); + this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1199); this.flowLayoutPanel1.TabIndex = 8; // // panel2 // this.panel2.BackColor = System.Drawing.Color.Transparent; this.panel2.Controls.Add(this.pictureBox7); - this.panel2.Location = new System.Drawing.Point(2, 2); - this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panel2.Location = new System.Drawing.Point(3, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(234, 214); + this.panel2.Size = new System.Drawing.Size(312, 263); this.panel2.TabIndex = 8; // // pictureBox7 // this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu; - this.pictureBox7.Location = new System.Drawing.Point(48, 28); - this.pictureBox7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.pictureBox7.Location = new System.Drawing.Point(64, 34); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(190, 197); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -197,11 +190,11 @@ this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button1.Image = global::compabetov2.Properties.Resources.Menui1; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(2, 220); - this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button1.Location = new System.Drawing.Point(3, 269); + this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button1.Name = "button1"; - this.button1.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button1.Size = new System.Drawing.Size(234, 93); + this.button1.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button1.Size = new System.Drawing.Size(312, 114); this.button1.TabIndex = 8; this.button1.Text = "Menú"; this.button1.UseVisualStyleBackColor = false; @@ -216,14 +209,13 @@ this.button2.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button2.Image = global::compabetov2.Properties.Resources.estadisticasi; this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button2.Location = new System.Drawing.Point(2, 317); - this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button2.Location = new System.Drawing.Point(3, 387); + this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button2.Name = "button2"; - this.button2.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button2.Size = new System.Drawing.Size(234, 93); + this.button2.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button2.Size = new System.Drawing.Size(312, 114); this.button2.TabIndex = 9; this.button2.Text = "Estadisticas"; - this.button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.button2.UseVisualStyleBackColor = false; // // button3 @@ -235,33 +227,15 @@ this.button3.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button3.Image = global::compabetov2.Properties.Resources.productoi; this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button3.Location = new System.Drawing.Point(2, 414); - this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button3.Location = new System.Drawing.Point(3, 505); + this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button3.Name = "button3"; - this.button3.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button3.Size = new System.Drawing.Size(234, 93); + this.button3.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button3.Size = new System.Drawing.Size(312, 114); this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; // - // button4 - // - this.button4.BackColor = System.Drawing.Color.Transparent; - this.button4.FlatAppearance.BorderSize = 0; - this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); - this.button4.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.button4.Image = global::compabetov2.Properties.Resources.reportesi; - this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button4.Location = new System.Drawing.Point(2, 511); - this.button4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.button4.Name = "button4"; - this.button4.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button4.Size = new System.Drawing.Size(234, 93); - this.button4.TabIndex = 11; - this.button4.Text = "Reportes"; - this.button4.UseVisualStyleBackColor = false; - // // button5 // this.button5.BackColor = System.Drawing.Color.Transparent; @@ -271,48 +245,40 @@ this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button5.Image = global::compabetov2.Properties.Resources.sesionc; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button5.Location = new System.Drawing.Point(2, 608); - this.button5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.button5.Location = new System.Drawing.Point(3, 623); + this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button5.Name = "button5"; - this.button5.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); - this.button5.Size = new System.Drawing.Size(234, 93); + this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); + this.button5.Size = new System.Drawing.Size(312, 114); this.button5.TabIndex = 12; this.button5.Text = "Salir"; this.button5.UseVisualStyleBackColor = false; // // flowLayoutPanel3 // - this.flowLayoutPanel3.Location = new System.Drawing.Point(244, 230); - this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.flowLayoutPanel3.Location = new System.Drawing.Point(325, 283); + this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.flowLayoutPanel3.Name = "flowLayoutPanel3"; - this.flowLayoutPanel3.Size = new System.Drawing.Size(955, 769); + this.flowLayoutPanel3.Size = new System.Drawing.Size(1273, 946); this.flowLayoutPanel3.TabIndex = 14; this.flowLayoutPanel3.Paint += new System.Windows.Forms.PaintEventHandler(this.flowLayoutPanel3_Paint); // - // textBox1 + // txtbusqueda // - this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); - this.textBox1.Location = new System.Drawing.Point(274, 186); - this.textBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(300, 30); - this.textBox1.TabIndex = 15; - // - // textBox2 - // - this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); - this.textBox2.Location = new System.Drawing.Point(594, 186); - this.textBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(300, 30); - this.textBox2.TabIndex = 16; + this.txtbusqueda.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); + this.txtbusqueda.Location = new System.Drawing.Point(365, 229); + this.txtbusqueda.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtbusqueda.Name = "txtbusqueda"; + this.txtbusqueda.Size = new System.Drawing.Size(666, 36); + this.txtbusqueda.TabIndex = 15; + this.txtbusqueda.TextChanged += new System.EventHandler(this.txtbusqueda_TextChanged); // // bntImprimir // - this.bntImprimir.Location = new System.Drawing.Point(1010, 62); - this.bntImprimir.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.bntImprimir.Location = new System.Drawing.Point(1347, 76); + this.bntImprimir.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.bntImprimir.Name = "bntImprimir"; - this.bntImprimir.Size = new System.Drawing.Size(56, 19); + this.bntImprimir.Size = new System.Drawing.Size(75, 23); this.bntImprimir.TabIndex = 17; this.bntImprimir.Text = "Vender"; this.bntImprimir.UseVisualStyleBackColor = true; @@ -326,18 +292,19 @@ "Cristofer Perez ", "Angel Alexander", "Emilio Urenda"}); - this.responsablecb.Location = new System.Drawing.Point(1081, 62); - this.responsablecb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.responsablecb.Location = new System.Drawing.Point(1441, 76); + this.responsablecb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.responsablecb.Name = "responsablecb"; - this.responsablecb.Size = new System.Drawing.Size(92, 21); + this.responsablecb.Size = new System.Drawing.Size(121, 24); this.responsablecb.TabIndex = 18; this.responsablecb.SelectedIndexChanged += new System.EventHandler(this.responsablecb_SelectedIndexChanged); // // btnFiar // - this.btnFiar.Location = new System.Drawing.Point(1022, 99); + this.btnFiar.Location = new System.Drawing.Point(1363, 122); + this.btnFiar.Margin = new System.Windows.Forms.Padding(4); this.btnFiar.Name = "btnFiar"; - this.btnFiar.Size = new System.Drawing.Size(75, 23); + this.btnFiar.Size = new System.Drawing.Size(100, 28); this.btnFiar.TabIndex = 19; this.btnFiar.Text = "Fiar"; this.btnFiar.UseVisualStyleBackColor = true; @@ -345,21 +312,20 @@ // // vender // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; - this.ClientSize = new System.Drawing.Size(1370, 609); + this.ClientSize = new System.Drawing.Size(1827, 750); this.Controls.Add(this.btnFiar); this.Controls.Add(this.responsablecb); this.Controls.Add(this.bntImprimir); - this.Controls.Add(this.textBox2); - this.Controls.Add(this.textBox1); + this.Controls.Add(this.txtbusqueda); this.Controls.Add(this.flowLayoutPanel3); this.Controls.Add(this.lblfecha); this.Controls.Add(this.lblhora); this.Controls.Add(this.flowLayoutPanel2); this.Controls.Add(this.flowLayoutPanel1); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "vender"; this.Text = "vender"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; @@ -385,7 +351,6 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; private System.Windows.Forms.Button button5; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.ComponentModel.BackgroundWorker backgroundWorker1; @@ -396,8 +361,7 @@ private System.Windows.Forms.Label lblfecha; private System.Windows.Forms.Label lblhora; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel3; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox txtbusqueda; private System.Windows.Forms.Label label1; private System.Windows.Forms.Label labeltotal; private System.Windows.Forms.Button bntImprimir; diff --git a/vender.cs b/vender.cs index 990b071..732d6a3 100644 --- a/vender.cs +++ b/vender.cs @@ -656,6 +656,12 @@ namespace compabetov2 bntImprimir.Enabled = responsablecb.SelectedIndex != -1; + } + + private void txtbusqueda_TextChanged(object sender, EventArgs e) + { + + } } } diff --git a/verMerma.Designer.cs b/verMerma.Designer.cs index c4d2206..4ce8977 100644 --- a/verMerma.Designer.cs +++ b/verMerma.Designer.cs @@ -34,80 +34,103 @@ this.txtDescripcion = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // txtResponsable // this.txtResponsable.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtResponsable.Location = new System.Drawing.Point(241, 10); + this.txtResponsable.Location = new System.Drawing.Point(371, 233); + this.txtResponsable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtResponsable.Name = "txtResponsable"; - this.txtResponsable.Size = new System.Drawing.Size(348, 29); + this.txtResponsable.Size = new System.Drawing.Size(463, 34); this.txtResponsable.TabIndex = 11; // // label3 // this.label3.AutoSize = true; + this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(110, 10); - this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label3.ForeColor = System.Drawing.Color.Transparent; + this.label3.Location = new System.Drawing.Point(187, 233); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(126, 24); + this.label3.Size = new System.Drawing.Size(162, 29); this.label3.TabIndex = 10; this.label3.Text = "Responsable:"; // // dtFecha // this.dtFecha.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dtFecha.Location = new System.Drawing.Point(241, 85); + this.dtFecha.Location = new System.Drawing.Point(371, 314); + this.dtFecha.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.dtFecha.Name = "dtFecha"; - this.dtFecha.Size = new System.Drawing.Size(348, 29); + this.dtFecha.Size = new System.Drawing.Size(463, 34); this.dtFecha.TabIndex = 9; // // txtDescripcion // this.txtDescripcion.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtDescripcion.Location = new System.Drawing.Point(11, 119); - this.txtDescripcion.Margin = new System.Windows.Forms.Padding(2); + this.txtDescripcion.Location = new System.Drawing.Point(192, 450); + this.txtDescripcion.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtDescripcion.Multiline = true; this.txtDescripcion.Name = "txtDescripcion"; - this.txtDescripcion.Size = new System.Drawing.Size(578, 195); + this.txtDescripcion.Size = new System.Drawing.Size(769, 239); this.txtDescripcion.TabIndex = 8; // // label2 // this.label2.AutoSize = true; + this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(11, 85); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.ForeColor = System.Drawing.Color.Transparent; + this.label2.Location = new System.Drawing.Point(475, 395); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(115, 24); + this.label2.Size = new System.Drawing.Size(147, 29); this.label2.TabIndex = 7; this.label2.Text = "Descripcion:"; // // label1 // this.label1.AutoSize = true; + this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(167, 89); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.ForeColor = System.Drawing.Color.Transparent; + this.label1.Location = new System.Drawing.Point(187, 319); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(69, 24); + this.label1.Size = new System.Drawing.Size(86, 29); this.label1.TabIndex = 6; this.label1.Text = "Fecha:"; // + // label4 + // + this.label4.AutoSize = true; + this.label4.BackColor = System.Drawing.Color.Transparent; + this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label4.ForeColor = System.Drawing.Color.Transparent; + this.label4.Location = new System.Drawing.Point(448, 169); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(193, 29); + this.label4.TabIndex = 17; + this.label4.Text = "Modificar Merma"; + // // verMerma // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(615, 325); + this.BackgroundImage = global::compabetov2.Properties.Resources.Form; + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.ClientSize = new System.Drawing.Size(1102, 747); + this.ControlBox = false; + this.Controls.Add(this.label4); this.Controls.Add(this.txtResponsable); this.Controls.Add(this.label3); this.Controls.Add(this.dtFecha); this.Controls.Add(this.txtDescripcion); this.Controls.Add(this.label2); this.Controls.Add(this.label1); + this.DoubleBuffered = true; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "verMerma"; - this.Text = "Merma"; this.Load += new System.EventHandler(this.verMerma_Load); this.ResumeLayout(false); this.PerformLayout(); @@ -122,5 +145,6 @@ private System.Windows.Forms.TextBox txtDescripcion; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label4; } } \ No newline at end of file