subir cambios 8
This commit is contained in:
carlos
Generated
+7
-43
@@ -46,13 +46,9 @@
|
||||
//
|
||||
this.panel2.BackColor = System.Drawing.Color.Transparent;
|
||||
this.panel2.Controls.Add(this.pictureBox7);
|
||||
<<<<<<< HEAD:cuentas.Designer.cs
|
||||
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);
|
||||
>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs
|
||||
this.panel2.Name = "panel2";
|
||||
this.panel2.Size = new System.Drawing.Size(312, 263);
|
||||
this.panel2.TabIndex = 8;
|
||||
@@ -60,13 +56,8 @@
|
||||
// pictureBox7
|
||||
//
|
||||
this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu;
|
||||
<<<<<<< HEAD:cuentas.Designer.cs
|
||||
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);
|
||||
>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs
|
||||
this.pictureBox7.Name = "pictureBox7";
|
||||
this.pictureBox7.Size = new System.Drawing.Size(190, 197);
|
||||
this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
|
||||
@@ -82,13 +73,9 @@
|
||||
this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
|
||||
this.button1.Image = global::compabetov2.Properties.Resources.Menui1;
|
||||
this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
<<<<<<< HEAD:cuentas.Designer.cs
|
||||
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);
|
||||
>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0);
|
||||
this.button1.Size = new System.Drawing.Size(312, 114);
|
||||
@@ -106,13 +93,10 @@
|
||||
this.button2.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
|
||||
this.button2.Image = global::compabetov2.Properties.Resources.estadisticasi;
|
||||
this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
<<<<<<< HEAD:cuentas.Designer.cs
|
||||
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);
|
||||
>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs
|
||||
|
||||
this.button2.Name = "button2";
|
||||
this.button2.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0);
|
||||
this.button2.Size = new System.Drawing.Size(312, 114);
|
||||
@@ -130,13 +114,9 @@
|
||||
this.button3.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
|
||||
this.button3.Image = global::compabetov2.Properties.Resources.productoi;
|
||||
this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
<<<<<<< HEAD:cuentas.Designer.cs
|
||||
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);
|
||||
>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs
|
||||
this.button3.Name = "button3";
|
||||
this.button3.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0);
|
||||
this.button3.Size = new System.Drawing.Size(312, 114);
|
||||
@@ -153,13 +133,9 @@
|
||||
this.button4.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
|
||||
this.button4.Image = global::compabetov2.Properties.Resources.reportesi;
|
||||
this.button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
<<<<<<< HEAD:cuentas.Designer.cs
|
||||
this.button4.Location = new System.Drawing.Point(2, 511);
|
||||
this.button4.Margin = new System.Windows.Forms.Padding(2);
|
||||
=======
|
||||
|
||||
this.button4.Location = new System.Drawing.Point(3, 623);
|
||||
this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs
|
||||
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);
|
||||
@@ -176,13 +152,9 @@
|
||||
this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
|
||||
this.button5.Image = global::compabetov2.Properties.Resources.sesionc;
|
||||
this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
<<<<<<< HEAD:cuentas.Designer.cs
|
||||
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, 741);
|
||||
this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs
|
||||
this.button5.Name = "button5";
|
||||
this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0);
|
||||
this.button5.Size = new System.Drawing.Size(312, 114);
|
||||
@@ -200,11 +172,7 @@
|
||||
this.flowLayoutPanel1.Controls.Add(this.button4);
|
||||
this.flowLayoutPanel1.Controls.Add(this.button5);
|
||||
this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, -1);
|
||||
<<<<<<< HEAD:cuentas.Designer.cs
|
||||
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2);
|
||||
=======
|
||||
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs
|
||||
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
|
||||
this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061);
|
||||
this.flowLayoutPanel1.TabIndex = 8;
|
||||
@@ -226,11 +194,7 @@
|
||||
this.ControlBox = false;
|
||||
this.Controls.Add(this.panelCuenta);
|
||||
this.Controls.Add(this.flowLayoutPanel1);
|
||||
<<<<<<< HEAD:cuentas.Designer.cs
|
||||
this.Margin = new System.Windows.Forms.Padding(2);
|
||||
=======
|
||||
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||
>>>>>>> 29c502b923393adeb58f76ab423298ad2bef9d0c:Cuentas/cuentas.Designer.cs
|
||||
this.Name = "cuentas";
|
||||
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
|
||||
this.Load += new System.EventHandler(this.cuentas_Load);
|
||||
|
||||
Reference in New Issue
Block a user