diff --git a/MenuPrincipal.Designer.cs b/MenuPrincipal.Designer.cs index ae84e27..4fa98a1 100644 --- a/MenuPrincipal.Designer.cs +++ b/MenuPrincipal.Designer.cs @@ -124,7 +124,7 @@ this.lblhora.AutoSize = true; this.lblhora.Font = new System.Drawing.Font("Poppins SemiBold", 60F); this.lblhora.ForeColor = System.Drawing.Color.MediumBlue; - this.lblhora.Location = new System.Drawing.Point(963, -6); + this.lblhora.Location = new System.Drawing.Point(953, -6); this.lblhora.Name = "lblhora"; this.lblhora.Size = new System.Drawing.Size(365, 177); this.lblhora.TabIndex = 8; diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index e10b1be..776191b 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 8dd753f..eafdd70 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/mermas.Designer.cs b/mermas.Designer.cs index 9b30aff..626ab5c 100644 --- a/mermas.Designer.cs +++ b/mermas.Designer.cs @@ -28,20 +28,212 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + 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.lblfecha = new System.Windows.Forms.Label(); + this.lblhora = new System.Windows.Forms.Label(); + this.horafecha = new System.Windows.Forms.Timer(this.components); + this.flowLayoutPanel1.SuspendLayout(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); this.SuspendLayout(); // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.BackgroundImage = global::compabetov2.Properties.Resources.rec; + this.flowLayoutPanel1.Controls.Add(this.panel2); + 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(3, 2, 3, 2); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + 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(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(312, 263); + this.panel2.TabIndex = 8; + // + // pictureBox7 + // + this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu; + 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; + this.pictureBox7.TabIndex = 8; + this.pictureBox7.TabStop = false; + // + // button1 + // + this.button1.BackColor = System.Drawing.Color.Transparent; + this.button1.FlatAppearance.BorderSize = 0; + this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); + 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(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(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; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // button2 + // + this.button2.BackColor = System.Drawing.Color.Transparent; + this.button2.FlatAppearance.BorderSize = 0; + this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); + 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(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(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 + // + this.button3.BackColor = System.Drawing.Color.Transparent; + this.button3.FlatAppearance.BorderSize = 0; + this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); + 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(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(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(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; + this.button5.FlatAppearance.BorderSize = 0; + this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); + 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.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); + this.button5.Size = new System.Drawing.Size(312, 114); + this.button5.TabIndex = 12; + this.button5.Text = "Salir"; + this.button5.UseVisualStyleBackColor = false; + // + // lblfecha + // + 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(741, 154); + this.lblfecha.Name = "lblfecha"; + this.lblfecha.Size = new System.Drawing.Size(159, 58); + this.lblfecha.TabIndex = 15; + this.lblfecha.Text = "label2"; + this.lblfecha.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // lblhora + // + 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(929, 35); + this.lblhora.Name = "lblhora"; + this.lblhora.Size = new System.Drawing.Size(318, 113); + this.lblhora.TabIndex = 14; + this.lblhora.Text = "label1"; + // + // horafecha + // + this.horafecha.Enabled = true; + this.horafecha.Tick += new System.EventHandler(this.horafecha_Tick_2); + // // mermas // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1924, 1055); + this.Controls.Add(this.lblfecha); + this.Controls.Add(this.lblhora); + this.Controls.Add(this.flowLayoutPanel1); this.Name = "mermas"; this.Text = "mermas"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; + this.Load += new System.EventHandler(this.mermas_Load); + this.flowLayoutPanel1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion + + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.PictureBox pictureBox7; + 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; + private System.Windows.Forms.Timer horafecha; } } \ No newline at end of file diff --git a/mermas.cs b/mermas.cs index 548818f..06b6c0a 100644 --- a/mermas.cs +++ b/mermas.cs @@ -16,5 +16,33 @@ namespace compabetov2 { InitializeComponent(); } + + private void mermas_Load(object sender, EventArgs e) + { + + } + + private void horafecha_Tick(object sender, EventArgs e) + { + + } + + private void horafecha_Tick_1(object sender, EventArgs e) + { + + } + + private void horafecha_Tick_2(object sender, EventArgs e) + { + lblhora.Text = DateTime.Now.ToString("h:mm:ss"); + lblfecha.Text = DateTime.Now.ToLongDateString(); + } + + private void button1_Click(object sender, EventArgs e) + { + MenuPrincipal menuPrincipal = new MenuPrincipal(); + menuPrincipal.Show(); + this.Dispose(true); + } } } diff --git a/mermas.resx b/mermas.resx index 1af7de1..87c0d97 100644 --- a/mermas.resx +++ b/mermas.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 4382aa9..f71e02f 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index efba121..38447aa 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 e10b1be..776191b 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 8dd753f..eafdd70 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ diff --git a/vender.Designer.cs b/vender.Designer.cs index 310cc08..e346d11 100644 --- a/vender.Designer.cs +++ b/vender.Designer.cs @@ -46,8 +46,6 @@ this.button3 = new System.Windows.Forms.Button(); this.button4 = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.timer2 = new System.Windows.Forms.Timer(this.components); this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel(); this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); @@ -318,7 +316,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; - this.ClientSize = new System.Drawing.Size(1827, 750); + this.ClientSize = new System.Drawing.Size(1827, 968); this.Controls.Add(this.bntImprimir); this.Controls.Add(this.textBox2); this.Controls.Add(this.textBox1); @@ -363,8 +361,6 @@ private System.Windows.Forms.Timer horafecha; private System.Windows.Forms.Label lblfecha; private System.Windows.Forms.Label lblhora; - private System.Windows.Forms.Timer timer1; - private System.Windows.Forms.Timer timer2; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel3; private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox textBox2; diff --git a/vender.resx b/vender.resx index 34aa1e9..4f076be 100644 --- a/vender.resx +++ b/vender.resx @@ -123,10 +123,4 @@ 143, 17 - - 269, 17 - - - 372, 17 - \ No newline at end of file