Kaynağa Gözat

Integracion 1

ahernandez 6 yıl önce
ebeveyn
işleme
396cee5a04

+ 4 - 4
App.config

@@ -7,14 +7,14 @@
     </configSections>
     <connectionStrings>
         <add name="Inversiones.My.MySettings.InversionesConnectionString"
-            connectionString="Data Source=INVSVSAP;Initial Catalog=InversionesDEV;Persist Security Info=True;User ID=ahernandez;Password=1234;Connect Timeout=30;ApplicationIntent=ReadOnly"
+            connectionString="Data Source=INVSVSAP;Initial Catalog=Inversiones;Persist Security Info=True;User ID=ahernandez;Password=1234;Connect Timeout=30;ApplicationIntent=ReadOnly"
             providerName="System.Data.SqlClient" />
         <add name="Inversiones.My.MySettings.SAP_INVERLEC_ESConnectionString"
             connectionString="Data Source=MESVSAP;Initial Catalog=SAP_INVERLEC_ES;User ID=ahernandez;Password=1234"
             providerName="System.Data.SqlClient" />
-        <add name="cnInversiones" connectionString="Data Source=INVSVSAP;Initial Catalog=InversionesDEV;Persist Security Info=True;User ID=ahernandez;Password=1234;Connect Timeout=30;ApplicationIntent=ReadOnly"
+        <add name="cnInversiones" connectionString="Data Source=INVSVSAP;Initial Catalog=Inversiones;Persist Security Info=True;User ID=ahernandez;Password=1234;Connect Timeout=30;ApplicationIntent=ReadOnly"
             providerName="System.Data.SqlClient" />
-        <add name="Inversiones.My.MySettings.cnInversiones" connectionString="Data Source=INVSVSAP;Initial Catalog=InversionesDEV;Persist Security Info=True;User ID=ahernandez;Password=1234"
+        <add name="Inversiones.My.MySettings.cnInversiones" connectionString="Data Source=INVSVSAP;Initial Catalog=Inversiones;Persist Security Info=True;User ID=ahernandez;Password=1234"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <startup>
@@ -56,7 +56,7 @@
                 <value>INVSVSAP</value>
             </setting>
             <setting name="BaseDeDatos" serializeAs="String">
-                <value>InversionesDEV</value>
+                <value>Inversiones</value>
             </setting>
         </Inversiones.My.MySettings>
     </applicationSettings>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 295 - 0
FRM/frmPrincipalInicio.Designer.vb


+ 120 - 0
FRM/frmPrincipalInicio.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

+ 101 - 0
FRM/frmPrincipalInicio.vb

@@ -0,0 +1,101 @@
+Public Class frmPrincipalInicio
+    Private Sub frmPrincipalInicio_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        Listas()
+    End Sub
+    Sub Fuente()
+        lblTitulo.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
+        lblRendimiento.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
+        lblIngreso.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
+        lblPortafolio.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
+
+
+
+        lblMontoIngresos.ForeColor = Drawing.Color.FromArgb(237, 51, 50)
+        lblIngresostexto.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
+        lblMontoRendimiento.ForeColor = Drawing.Color.FromArgb(237, 51, 50)
+        lblRendimientotexto.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
+    End Sub
+    Sub RendimientoMonto()
+        Dim general As New DAOGeneral
+        Dim Monto As String = "0.00"
+        Dim Cantidad As Integer = 0
+        Dim Rendimiento As String = "0.00 "
+        Dim dt As DataTable = general.RendimientoMontoGraficas
+        For Each rows As DataRow In dt.Rows
+            If Not String.IsNullOrEmpty(rows("Rendimiento").ToString) Then
+                Rendimiento = rows("Rendimiento").ToString
+            End If
+
+            If Not String.IsNullOrEmpty(rows("Monto").ToString) Then
+                Monto = rows("Monto").ToString
+            End If
+
+            If Not String.IsNullOrEmpty(rows("Cantidad").ToString) Then
+                Cantidad = rows("Cantidad")
+            End If
+        Next
+
+        lblMontoIngresos.Text = "$ " + Monto
+        If Cantidad = 0 Then
+            lblMontoRendimiento.Text = "0 %"
+        Else
+
+            lblMontoRendimiento.Text = FormatNumber((((CDec(Rendimiento) / Cantidad)) * 100), 6).ToString + " %"
+        End If
+    End Sub
+
+    Sub GraficaInstrumentos()
+        Dim general As New DAOGeneral
+        Dim dt As DataTable = general.InstrumentosGrafica
+
+
+
+        charPastel.Series(0).Points.Clear()
+        charPastel.Series(0).IsValueShownAsLabel = False
+        charPastel.Series(0).LabelForeColor = Color.Transparent
+        'charPastel.Series(0).LabelAngle = -45
+
+        'charPastel.Series(0).Font = New Font(charPastel.Series(0).Font.Name, 5)
+
+        'charPastel.ChartAreas(0).Area3DStyle.Enable3D = True
+
+        charPastel.Series(0).XValueMember = "Instrumento"
+        charPastel.Series(0).YValueMembers = "Cantidad"
+
+        charPastel.DataSource = dt
+    End Sub
+
+    Sub GraficaMontoInstrumentos()
+        Dim general As New DAOGeneral
+
+        Dim dt As DataTable = general.MontosInstrumentosGrafica
+        charbarras.Series(0).Points.Clear()
+        'charbarras.ChartAreas(0).Area3DStyle.Enable3D = True
+
+
+        charbarras.Series(0).XValueMember = "Instrumento"
+        charbarras.Series(0).YValueMembers = "Suma"
+        charbarras.DataSource = dt
+    End Sub
+
+
+    Sub GraficaRendimientoInstrumentos()
+        Dim general As New DAOGeneral
+
+        Dim dt As DataTable = general.RendimientosInstrumentoGrafica
+        charlineal.Series(0).Points.Clear()
+
+
+
+        charlineal.Series(0).XValueMember = "Instrumento"
+        charlineal.Series(0).YValueMembers = "Suma"
+        charlineal.DataSource = dt
+    End Sub
+    Sub Listas()
+        Fuente()
+        GraficaInstrumentos()
+        GraficaMontoInstrumentos()
+        GraficaRendimientoInstrumentos()
+        RendimientoMonto()
+    End Sub
+End Class

+ 9 - 0
Inversiones.vbproj

@@ -596,6 +596,12 @@
     <Compile Include="FRM\frmPrestamoPersonal.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="FRM\frmPrincipalInicio.Designer.vb">
+      <DependentUpon>frmPrincipalInicio.vb</DependentUpon>
+    </Compile>
+    <Compile Include="FRM\frmPrincipalInicio.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="FRM\frmProgreso.Designer.vb">
       <DependentUpon>frmProgreso.vb</DependentUpon>
     </Compile>
@@ -1044,6 +1050,9 @@
     <EmbeddedResource Include="FRM\frmPrestamoPersonal.resx">
       <DependentUpon>frmPrestamoPersonal.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FRM\frmPrincipalInicio.resx">
+      <DependentUpon>frmPrincipalInicio.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FRM\frmProgreso.resx">
       <DependentUpon>frmProgreso.vb</DependentUpon>
     </EmbeddedResource>

+ 16 - 31
frmINV.Designer.vb

@@ -178,7 +178,6 @@ Partial Class frmINV
         Me.lblMensajeReq = New System.Windows.Forms.Label()
         Me.vBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.Panel8 = New System.Windows.Forms.Panel()
-        Me.btnReportoVenta = New System.Windows.Forms.Button()
         navSiguienteRegistro = New System.Windows.Forms.ToolStripButton()
         Me.Panel1.SuspendLayout()
         CType(Me.Navegador, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -472,9 +471,9 @@ Partial Class frmINV
         Me.GroupBox1.BackColor = System.Drawing.Color.WhiteSmoke
         Me.GroupBox1.Controls.Add(Me.pnlMenu)
         Me.GroupBox1.Controls.Add(Me.pnlCargaDatos)
-        Me.GroupBox1.Location = New System.Drawing.Point(22, 28)
+        Me.GroupBox1.Location = New System.Drawing.Point(6, 6)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(1057, 552)
+        Me.GroupBox1.Size = New System.Drawing.Size(1073, 574)
         Me.GroupBox1.TabIndex = 177
         Me.GroupBox1.TabStop = False
         '
@@ -1197,7 +1196,7 @@ Partial Class frmINV
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.29703!))
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 207.0!))
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 213.0!))
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 239.0!))
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 240.0!))
         Me.TableLayoutPanel2.Controls.Add(Me.GroupBox6, 3, 0)
         Me.TableLayoutPanel2.Controls.Add(Me.GroupBox5, 2, 0)
         Me.TableLayoutPanel2.Controls.Add(Me.GroupBox4, 1, 0)
@@ -1226,7 +1225,7 @@ Partial Class frmINV
         '
         Me.GroupBox6.Controls.Add(Me.cboTipoOperacion)
         Me.GroupBox6.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox6.Location = New System.Drawing.Point(589, 3)
+        Me.GroupBox6.Location = New System.Drawing.Point(588, 3)
         Me.GroupBox6.Name = "GroupBox6"
         Me.GroupBox6.Size = New System.Drawing.Size(207, 43)
         Me.GroupBox6.TabIndex = 3
@@ -1249,7 +1248,7 @@ Partial Class frmINV
         '
         Me.GroupBox5.Controls.Add(Me.cboEstadoDocumento)
         Me.GroupBox5.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox5.Location = New System.Drawing.Point(382, 3)
+        Me.GroupBox5.Location = New System.Drawing.Point(381, 3)
         Me.GroupBox5.Name = "GroupBox5"
         Me.GroupBox5.Size = New System.Drawing.Size(201, 43)
         Me.GroupBox5.TabIndex = 2
@@ -1273,7 +1272,7 @@ Partial Class frmINV
         Me.GroupBox4.Dock = System.Windows.Forms.DockStyle.Fill
         Me.GroupBox4.Location = New System.Drawing.Point(191, 3)
         Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.Size = New System.Drawing.Size(185, 43)
+        Me.GroupBox4.Size = New System.Drawing.Size(184, 43)
         Me.GroupBox4.TabIndex = 1
         Me.GroupBox4.TabStop = False
         Me.GroupBox4.Text = "Emisores"
@@ -1318,9 +1317,9 @@ Partial Class frmINV
         '
         Me.GroupBox7.Controls.Add(Me.cboOrigenDeFondos)
         Me.GroupBox7.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox7.Location = New System.Drawing.Point(802, 3)
+        Me.GroupBox7.Location = New System.Drawing.Point(801, 3)
         Me.GroupBox7.Name = "GroupBox7"
-        Me.GroupBox7.Size = New System.Drawing.Size(234, 43)
+        Me.GroupBox7.Size = New System.Drawing.Size(235, 43)
         Me.GroupBox7.TabIndex = 4
         Me.GroupBox7.TabStop = False
         Me.GroupBox7.Text = "Origenes de Fondo"
@@ -1376,7 +1375,7 @@ Partial Class frmINV
         Me.GroupBox9.Dock = System.Windows.Forms.DockStyle.Fill
         Me.GroupBox9.Location = New System.Drawing.Point(191, 52)
         Me.GroupBox9.Name = "GroupBox9"
-        Me.GroupBox9.Size = New System.Drawing.Size(185, 41)
+        Me.GroupBox9.Size = New System.Drawing.Size(184, 41)
         Me.GroupBox9.TabIndex = 6
         Me.GroupBox9.TabStop = False
         Me.GroupBox9.Text = "Calificacion de Riesgo"
@@ -1397,7 +1396,7 @@ Partial Class frmINV
         '
         Me.GroupBox10.Controls.Add(Me.cboTipoTasa)
         Me.GroupBox10.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox10.Location = New System.Drawing.Point(382, 52)
+        Me.GroupBox10.Location = New System.Drawing.Point(381, 52)
         Me.GroupBox10.Name = "GroupBox10"
         Me.GroupBox10.Size = New System.Drawing.Size(201, 41)
         Me.GroupBox10.TabIndex = 7
@@ -1420,7 +1419,7 @@ Partial Class frmINV
         '
         Me.GroupBox11.Controls.Add(Me.cboCalificadoras)
         Me.GroupBox11.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox11.Location = New System.Drawing.Point(589, 52)
+        Me.GroupBox11.Location = New System.Drawing.Point(588, 52)
         Me.GroupBox11.Name = "GroupBox11"
         Me.GroupBox11.Size = New System.Drawing.Size(207, 41)
         Me.GroupBox11.TabIndex = 8
@@ -1443,9 +1442,9 @@ Partial Class frmINV
         '
         Me.GroupBox12.Controls.Add(Me.cboEstadoProceso)
         Me.GroupBox12.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox12.Location = New System.Drawing.Point(802, 52)
+        Me.GroupBox12.Location = New System.Drawing.Point(801, 52)
         Me.GroupBox12.Name = "GroupBox12"
-        Me.GroupBox12.Size = New System.Drawing.Size(234, 41)
+        Me.GroupBox12.Size = New System.Drawing.Size(235, 41)
         Me.GroupBox12.TabIndex = 9
         Me.GroupBox12.TabStop = False
         Me.GroupBox12.Text = "Estado de Proceso"
@@ -1494,7 +1493,7 @@ Partial Class frmINV
         Me.GroupBox14.ForeColor = System.Drawing.Color.Maroon
         Me.GroupBox14.Location = New System.Drawing.Point(191, 99)
         Me.GroupBox14.Name = "GroupBox14"
-        Me.GroupBox14.Size = New System.Drawing.Size(185, 36)
+        Me.GroupBox14.Size = New System.Drawing.Size(184, 36)
         Me.GroupBox14.TabIndex = 11
         Me.GroupBox14.TabStop = False
         Me.GroupBox14.Text = "Paises *"
@@ -1514,7 +1513,7 @@ Partial Class frmINV
         'GroupBox15
         '
         Me.GroupBox15.Controls.Add(Me.cboPeriodicidad)
-        Me.GroupBox15.Location = New System.Drawing.Point(382, 99)
+        Me.GroupBox15.Location = New System.Drawing.Point(381, 99)
         Me.GroupBox15.Name = "GroupBox15"
         Me.GroupBox15.Size = New System.Drawing.Size(198, 36)
         Me.GroupBox15.TabIndex = 12
@@ -1536,7 +1535,7 @@ Partial Class frmINV
         'GroupBox16
         '
         Me.GroupBox16.Controls.Add(Me.cboTipoRenta)
-        Me.GroupBox16.Location = New System.Drawing.Point(589, 99)
+        Me.GroupBox16.Location = New System.Drawing.Point(588, 99)
         Me.GroupBox16.Name = "GroupBox16"
         Me.GroupBox16.Size = New System.Drawing.Size(207, 36)
         Me.GroupBox16.TabIndex = 13
@@ -1832,7 +1831,6 @@ Partial Class frmINV
         'Panel8
         '
         Me.Panel8.BackColor = System.Drawing.Color.Transparent
-        Me.Panel8.Controls.Add(Me.btnReportoVenta)
         Me.Panel8.Controls.Add(Me.Label22)
         Me.Panel8.Controls.Add(Me.lblMensajeReq)
         Me.Panel8.Controls.Add(Me.btnRequisicionDePago)
@@ -1845,18 +1843,6 @@ Partial Class frmINV
         Me.Panel8.Size = New System.Drawing.Size(1152, 93)
         Me.Panel8.TabIndex = 192
         '
-        'btnReportoVenta
-        '
-        Me.btnReportoVenta.BackColor = System.Drawing.Color.Maroon
-        Me.btnReportoVenta.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnReportoVenta.ForeColor = System.Drawing.Color.White
-        Me.btnReportoVenta.Location = New System.Drawing.Point(748, 35)
-        Me.btnReportoVenta.Name = "btnReportoVenta"
-        Me.btnReportoVenta.Size = New System.Drawing.Size(108, 35)
-        Me.btnReportoVenta.TabIndex = 192
-        Me.btnReportoVenta.Text = "Reporto de Venta"
-        Me.btnReportoVenta.UseVisualStyleBackColor = False
-        '
         'frmINV
         '
         Me.AcceptButton = Me.btnAccion
@@ -2116,6 +2102,5 @@ Partial Class frmINV
     Friend WithEvents Panel8 As Panel
     Friend WithEvents lblCodigoCompra As Label
     Friend WithEvents txtCodigoCompra As TextBox
-    Friend WithEvents btnReportoVenta As Button
     Friend WithEvents Label5 As Label
 End Class

+ 31 - 18
frmINV.vb

@@ -2710,32 +2710,45 @@
             P_cboObjeto.SelectedIndex = i
             Dim Valor As String = P_cboObjeto.SelectedValue
             Dim Texto As String = P_cboObjeto.Text
-            If Not String.IsNullOrEmpty(Valor.ToString) Or Not String.IsNullOrEmpty(Texto.ToString) Then
-                Datos.Add(Valor, Texto)
-            End If
+            If Not Valor Is Nothing Then
+
 
+                If Not String.IsNullOrEmpty(Valor.ToString) Or Not String.IsNullOrEmpty(Texto.ToString) Then
+                    Datos.Add(Valor, Texto)
+                End If
+            End If
             i += 1
         End While
 
+        Dim Existe As Boolean = False
+        For Each item As CheckBox In P_flpObjeto.Controls
+            If item.Text.ToString = "Todos" Then
+                Existe = True
+            End If
+        Next
+
+
 
         Dim O_ChequeTodos As New CheckBox
-        O_ChequeTodos.Name = "Todos" + P_flpObjeto.Name.ToString
-        O_ChequeTodos.Checked = True
-        O_ChequeTodos.Width = 250
-        O_ChequeTodos.BackColor = ColorTranslator.FromHtml("#EAEAE8")
-        O_ChequeTodos.Text = "Todos"
-        O_ChequeTodos.Height = 20
-        O_ChequeTodos.Margin = New Padding(25, 5, 25, 5)
+            O_ChequeTodos.Name = "Todos" + P_flpObjeto.Name.ToString
+            O_ChequeTodos.Checked = True
+            O_ChequeTodos.Width = 250
+            O_ChequeTodos.BackColor = ColorTranslator.FromHtml("#EAEAE8")
+            O_ChequeTodos.Text = "Todos"
+            O_ChequeTodos.Height = 20
+            O_ChequeTodos.Margin = New Padding(25, 5, 25, 5)
+
+        If Not Existe Then
+            P_flpObjeto.Controls.Add(O_ChequeTodos)
+            AddHandler O_ChequeTodos.Click, AddressOf evento
+            AddHandler O_ChequeTodos.CheckedChanged, AddressOf Colorevento
+        End If
         Col_Generica.Add(O_ChequeTodos.Name)
-        P_flpObjeto.Controls.Add(O_ChequeTodos)
-        AddHandler O_ChequeTodos.Click, AddressOf evento
-        AddHandler O_ChequeTodos.CheckedChanged, AddressOf Colorevento
-
 
-        For Each RecorrerDatos In Datos
+            For Each RecorrerDatos In Datos
             Col_Generica.Add(RecorrerDatos.Key)
             Dim O_Check As New CheckBox
-            Dim Existe As Boolean = False
+            Existe = False
             Dim Nombre = RecorrerDatos.Value
 
 
@@ -2758,7 +2771,7 @@
                 AddHandler O_Check.Click, AddressOf evento
                 AddHandler O_Check.CheckedChanged, AddressOf Colorevento
             End If
-            Existe = False
+
         Next
 
 
@@ -3788,7 +3801,7 @@
         End If
     End Sub
 
-    Private Sub btnReportoVenta_Click(sender As Object, e As EventArgs) Handles btnReportoVenta.Click
+    Private Sub btnReportoVenta_Click(sender As Object, e As EventArgs)
 
 
     End Sub

+ 20 - 20
frmPIN.designer.vb

@@ -328,7 +328,7 @@ Partial Class frmPIN
         Me.cboEmpresas.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.cboEmpresas.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.cboEmpresas.FormattingEnabled = True
-        Me.cboEmpresas.Location = New System.Drawing.Point(10, 14)
+        Me.cboEmpresas.Location = New System.Drawing.Point(9, 14)
         Me.cboEmpresas.Name = "cboEmpresas"
         Me.cboEmpresas.Size = New System.Drawing.Size(161, 21)
         Me.cboEmpresas.TabIndex = 1
@@ -919,9 +919,9 @@ Partial Class frmPIN
         Me.GroupBox1.BackColor = System.Drawing.Color.WhiteSmoke
         Me.GroupBox1.Controls.Add(Me.pnlMenu)
         Me.GroupBox1.Controls.Add(Me.pnlCargaDatos)
-        Me.GroupBox1.Location = New System.Drawing.Point(22, 28)
+        Me.GroupBox1.Location = New System.Drawing.Point(6, 6)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(1057, 552)
+        Me.GroupBox1.Size = New System.Drawing.Size(1073, 574)
         Me.GroupBox1.TabIndex = 177
         Me.GroupBox1.TabStop = False
         '
@@ -1521,7 +1521,7 @@ Partial Class frmPIN
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.29703!))
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 205.0!))
         Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 221.0!))
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 250.0!))
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 251.0!))
         Me.TableLayoutPanel2.Controls.Add(Me.GroupBox17, 0, 2)
         Me.TableLayoutPanel2.Controls.Add(Me.GroupBox16, 0, 2)
         Me.TableLayoutPanel2.Controls.Add(Me.GroupBox15, 0, 2)
@@ -1550,7 +1550,7 @@ Partial Class frmPIN
         '
         Me.GroupBox17.Controls.Add(Me.cboTasa)
         Me.GroupBox17.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox17.Location = New System.Drawing.Point(570, 99)
+        Me.GroupBox17.Location = New System.Drawing.Point(569, 99)
         Me.GroupBox17.Name = "GroupBox17"
         Me.GroupBox17.Size = New System.Drawing.Size(215, 36)
         Me.GroupBox17.TabIndex = 14
@@ -1562,7 +1562,7 @@ Partial Class frmPIN
         Me.GroupBox16.Controls.Add(Me.cboPaises)
         Me.GroupBox16.Dock = System.Windows.Forms.DockStyle.Fill
         Me.GroupBox16.ForeColor = System.Drawing.Color.Maroon
-        Me.GroupBox16.Location = New System.Drawing.Point(183, 99)
+        Me.GroupBox16.Location = New System.Drawing.Point(182, 99)
         Me.GroupBox16.Name = "GroupBox16"
         Me.GroupBox16.Size = New System.Drawing.Size(176, 36)
         Me.GroupBox16.TabIndex = 13
@@ -1587,7 +1587,7 @@ Partial Class frmPIN
         '
         Me.GroupBox15.Controls.Add(Me.cboRenta)
         Me.GroupBox15.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox15.Location = New System.Drawing.Point(365, 99)
+        Me.GroupBox15.Location = New System.Drawing.Point(364, 99)
         Me.GroupBox15.Name = "GroupBox15"
         Me.GroupBox15.Size = New System.Drawing.Size(199, 36)
         Me.GroupBox15.TabIndex = 12
@@ -1598,7 +1598,7 @@ Partial Class frmPIN
         '
         Me.GroupBox6.Controls.Add(Me.cboTipoOperacion)
         Me.GroupBox6.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox6.Location = New System.Drawing.Point(570, 3)
+        Me.GroupBox6.Location = New System.Drawing.Point(569, 3)
         Me.GroupBox6.Name = "GroupBox6"
         Me.GroupBox6.Size = New System.Drawing.Size(215, 43)
         Me.GroupBox6.TabIndex = 3
@@ -1609,7 +1609,7 @@ Partial Class frmPIN
         '
         Me.GroupBox5.Controls.Add(Me.cboEstadoDocumento)
         Me.GroupBox5.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox5.Location = New System.Drawing.Point(365, 3)
+        Me.GroupBox5.Location = New System.Drawing.Point(364, 3)
         Me.GroupBox5.Name = "GroupBox5"
         Me.GroupBox5.Size = New System.Drawing.Size(199, 43)
         Me.GroupBox5.TabIndex = 2
@@ -1620,7 +1620,7 @@ Partial Class frmPIN
         '
         Me.GroupBox4.Controls.Add(Me.cboEmisores)
         Me.GroupBox4.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox4.Location = New System.Drawing.Point(183, 3)
+        Me.GroupBox4.Location = New System.Drawing.Point(182, 3)
         Me.GroupBox4.Name = "GroupBox4"
         Me.GroupBox4.Size = New System.Drawing.Size(176, 43)
         Me.GroupBox4.TabIndex = 1
@@ -1634,7 +1634,7 @@ Partial Class frmPIN
         Me.GroupBox3.ForeColor = System.Drawing.Color.Maroon
         Me.GroupBox3.Location = New System.Drawing.Point(3, 3)
         Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Size = New System.Drawing.Size(174, 43)
+        Me.GroupBox3.Size = New System.Drawing.Size(173, 43)
         Me.GroupBox3.TabIndex = 0
         Me.GroupBox3.TabStop = False
         Me.GroupBox3.Text = "Empresas *"
@@ -1643,9 +1643,9 @@ Partial Class frmPIN
         '
         Me.GroupBox7.Controls.Add(Me.cboOrigenDeFondos)
         Me.GroupBox7.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox7.Location = New System.Drawing.Point(791, 3)
+        Me.GroupBox7.Location = New System.Drawing.Point(790, 3)
         Me.GroupBox7.Name = "GroupBox7"
-        Me.GroupBox7.Size = New System.Drawing.Size(245, 43)
+        Me.GroupBox7.Size = New System.Drawing.Size(246, 43)
         Me.GroupBox7.TabIndex = 4
         Me.GroupBox7.TabStop = False
         Me.GroupBox7.Text = "Origenes de Fondo"
@@ -1658,7 +1658,7 @@ Partial Class frmPIN
         Me.GroupBox8.ForeColor = System.Drawing.Color.Maroon
         Me.GroupBox8.Location = New System.Drawing.Point(3, 52)
         Me.GroupBox8.Name = "GroupBox8"
-        Me.GroupBox8.Size = New System.Drawing.Size(174, 41)
+        Me.GroupBox8.Size = New System.Drawing.Size(173, 41)
         Me.GroupBox8.TabIndex = 5
         Me.GroupBox8.TabStop = False
         Me.GroupBox8.Text = "Instrumentos *"
@@ -1667,7 +1667,7 @@ Partial Class frmPIN
         '
         Me.GroupBox9.Controls.Add(Me.cboCalificacionDeRiesgo)
         Me.GroupBox9.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox9.Location = New System.Drawing.Point(183, 52)
+        Me.GroupBox9.Location = New System.Drawing.Point(182, 52)
         Me.GroupBox9.Name = "GroupBox9"
         Me.GroupBox9.Size = New System.Drawing.Size(176, 41)
         Me.GroupBox9.TabIndex = 6
@@ -1678,7 +1678,7 @@ Partial Class frmPIN
         '
         Me.GroupBox10.Controls.Add(Me.cboPeriodicidad)
         Me.GroupBox10.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox10.Location = New System.Drawing.Point(365, 52)
+        Me.GroupBox10.Location = New System.Drawing.Point(364, 52)
         Me.GroupBox10.Name = "GroupBox10"
         Me.GroupBox10.Size = New System.Drawing.Size(199, 41)
         Me.GroupBox10.TabIndex = 7
@@ -1689,7 +1689,7 @@ Partial Class frmPIN
         '
         Me.GroupBox11.Controls.Add(Me.cboCalificadoraDeRiesgo)
         Me.GroupBox11.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox11.Location = New System.Drawing.Point(570, 52)
+        Me.GroupBox11.Location = New System.Drawing.Point(569, 52)
         Me.GroupBox11.Name = "GroupBox11"
         Me.GroupBox11.Size = New System.Drawing.Size(215, 41)
         Me.GroupBox11.TabIndex = 8
@@ -1700,9 +1700,9 @@ Partial Class frmPIN
         '
         Me.GroupBox12.Controls.Add(Me.cboAutorizacion)
         Me.GroupBox12.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GroupBox12.Location = New System.Drawing.Point(791, 52)
+        Me.GroupBox12.Location = New System.Drawing.Point(790, 52)
         Me.GroupBox12.Name = "GroupBox12"
-        Me.GroupBox12.Size = New System.Drawing.Size(245, 41)
+        Me.GroupBox12.Size = New System.Drawing.Size(246, 41)
         Me.GroupBox12.TabIndex = 9
         Me.GroupBox12.TabStop = False
         Me.GroupBox12.Text = "Autorizacion"
@@ -1714,7 +1714,7 @@ Partial Class frmPIN
         Me.GroupBox13.ForeColor = System.Drawing.Color.Maroon
         Me.GroupBox13.Location = New System.Drawing.Point(3, 99)
         Me.GroupBox13.Name = "GroupBox13"
-        Me.GroupBox13.Size = New System.Drawing.Size(174, 36)
+        Me.GroupBox13.Size = New System.Drawing.Size(173, 36)
         Me.GroupBox13.TabIndex = 10
         Me.GroupBox13.TabStop = False
         Me.GroupBox13.Text = "Tipo de Mercado *"

+ 18 - 17
frmPIN.resx

@@ -185,15 +185,15 @@
   <data name="navNuevo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHcSURBVDhPnZFLTBpRFIanLtptxY1bt2Xn2lXbdOVj4YoO
-        +ADMyGjc0HVnp2laY5p0VTfWiLbYNB3SxHZr4oNgHB8jEsDy0IAzOsBQmEcwHOfeABXiNKR/8uXkzJz7
-        3Zl7CZQ8t/A4zS9aUtwHa+pk3crz/of4RTuJRt8/KhzNdeYjb3sSoaFKKcyM0J6ZIDVBiW4nJbpacBpQ
-        Y1MZu825iQXp7XmLHH7Tr+0+Bz00CDr3ElRFAlX7Y0qpLAOSYMFFcLarEHqhvGOeVvXDqV5t5xlo+yTE
-        clVTkIQkKbEm+NRV5Jkn+t4waFt9oAYHQBAEnYtnYMX3Gb6zgQbrX7/BYeKqWYAOTOD93RPj7hvNkLAb
-        7DkaSEgViIsKxAziotogkas0C+oZcbgUMS8DG/iBByLnEnxcXILlZV+D1TU/RDOyuUAqlvGnooHkVQn4
-        31k4Omsmea20JwhnSsDFs7BvgGqd00sTgaNFcJKWwLf6pXGACNSfXhRMBPZmQey6AhFB+Yuxc+RSxc/b
-        Ehzcc42oP062XGM9dnI8d1eQlquYVK3e5V6BzTZZzhuCjZ+/8MC/UNQijI5O87WlBAEAD4xfYL3e1+CZ
-        9ALteYWrGTRN6w7SHWAYpqOm+N8QxC3b0mvwrfREqAAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHbSURBVDhPnZFNTNpgGMe7Hdx108uuXvW2805z2WnqYScs
+        +IGYSjVe8GxvW4wxZoknvWxmoKIxlixxuy5xG8HQgQUJMPnQoK0WKIN+BMNj3zfAhNiF7J/88uRpn/f3
+        tu9LoBS4lcdZfr07w632ZyI7/Tzv7cIvOkk8/v5RMfzuSSG21JsKDFfLUWaUds75qSlKdNgpcbINuwE1
+        PpOzWuzfsCD7fblbji6+1n6+BD0wBDo3Aqoigar9MaVckQFJsODc/7anGHilLDEvanpo5pn2YwC0IAmJ
+        fM0UJCFJSqwLPvaUeKZPP3oD2uFzUP2DIAiCziVz8Mm9Bfusr8nO7h6EUletAnRgAu99OjXhuNEMCXvA
+        nqGBlFSFpKhAwiApqk1S+WqroJFR26QiFmRgfZ/xQOxMgrX1D7Cx4W7i2fRCPCebC6RSBX8qGkhflYE/
+        vYDw71bS10pngmiuDFzyAoIGqDY4uTQR2NoEkawEbs928wARqD85L5oIrK2CxHUVYoLyF2Pn2KWKn3ck
+        +HXPNaL+ON12jY1YyYn8XUFWrmEy9XqXewUWy3SlYAgOvnzFA/9CUUswNjbL15cSBAA8MH6BdbkWwDnt
+        Ato5j6sZNE3rNtLhYxjmYV3xvyGIW9iOa+8x1QXEAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="navModificar.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -214,14 +214,15 @@
   <data name="navEliminar.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGxSURBVDhPlZM7S8NQGIZT0/4AF3HwCg4iOLV0k2q9bP4A
-        xUUUcXJwUHRxE1QcagidOrnoYAelWKEQdREEFwc3LwVJ6c1ek/T+er7Q1KqtrR88JBzO++T7ziFctXoY
-        Voa9BQOMDsavsqqqmpQkqVwqldCIXC4HQRBcbG9DiZ3C2WwWiqLUSKVSSCQSCIfDuiQUCkEUxV8SE8NO
-        GzRNQz6f159EJpNBMplEJBLRBaxL0Efcbrch0asmoLABCSiQTqcRjUa/jUNQppr9EhSLxdoGeqe5jVFi
-        sZjeiSzLzQU/qZdQJ3Qe8Xi8fQFhSGgcOhMS0XrbAqJQKOjnQhKC1v4loC7ezo5wtziCwKQFN/P9EOwm
-        8U8BhQyCXgGPG2PQfIeoPPmhnKxDcoyWr8bNay0F1P7twhBUFsbRLLDZCewOIro/Dt8E/9JUUC+htisP
-        XtRXYqcbO05zpSZwuVyVRhLieq4PWc8SwEK5DQ4fjOAqD/80/04CKhu7HqXZz/R6eoD7lWHIm4OIbFnw
-        vGxCwGEuX051bFfzXC/DxqCraYhnpks8d/IytX3h4MPHY/wex3HcJ/E1g0s+Et1bAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPlZM7S8NQGIbTpv4AF3HwCg4iOCndSut18wco
+        LqKIk4ODRZdugopQDaGTk4sOOijFCoWqiyC4OLh5A0lp2tprmvSW1/OFplZttX7wkHA475PvO4dwlepg
+        DDHsf9DDsDJ+1FAul0uGQqFyqVRCPTRNgyAIu2xvXYmdwtlsFoqiVEmlUkgkEohEIoYkHA5DFMUfEgvD
+        ThtUVUU+nzeeRCaTQTKZhCzLhoB1CfqIz+czJUZVBRQ2IQEF0uk0otHol3EIylSyn4JisVjdQO80tzlK
+        LBYzOpEkqbHgO7US6oTOIx6PNy8gTAmNQ2dCIlpvWkAUCgXjXEhC0Nq/BNTFy/EebuYGEBxrwdVMNwS7
+        RfxVQCGT1xMB96sOqP4d6A8BKIcrCDkHyxcu2/KfAmr/erYPORbG3hTgbgU2ehHdcsE/wj81FNRKqG39
+        7gS1lfC0wzNq06sCr9er15MQl9NdyO7PAyykrXJ4Z7wu8QhM8G8koBpm16M0+pmej7Zxu9gPyd0Lea0F
+        jwsWBJ228vm4db2S5zoZwwy6mrrsT7aJp6O8RG2fOfnIgYPf5DiO+wDvCoNIxm35EwAAAABJRU5ErkJg
+        gg==
 </value>
   </data>
   <data name="navEliminarRegistro.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+ 44 - 37
frmPIN.vb

@@ -186,25 +186,32 @@ Public Class frmPIN
             i += 1
         End While
 
+        Dim Existe As Boolean = False
+        For Each item As CheckBox In P_flpObjeto.Controls
+            If item.Text.ToString = "Todos" Then
+                Existe = True
+            End If
+        Next
 
         Dim O_ChequeTodos As New CheckBox
-        O_ChequeTodos.Name = "Todos" + P_flpObjeto.Name.ToString
-        O_ChequeTodos.Checked = True
-        O_ChequeTodos.Width = 250
-        O_ChequeTodos.BackColor = ColorTranslator.FromHtml("#EAEAE8")
-        O_ChequeTodos.Text = "Todos"
-        O_ChequeTodos.Height = 20
-        O_ChequeTodos.Margin = New Padding(25, 5, 25, 5)
+            O_ChequeTodos.Name = "Todos" + P_flpObjeto.Name.ToString
+            O_ChequeTodos.Checked = True
+            O_ChequeTodos.Width = 250
+            O_ChequeTodos.BackColor = ColorTranslator.FromHtml("#EAEAE8")
+            O_ChequeTodos.Text = "Todos"
+            O_ChequeTodos.Height = 20
+            O_ChequeTodos.Margin = New Padding(25, 5, 25, 5)
         Col_Generica.Add(O_ChequeTodos.Name)
-        P_flpObjeto.Controls.Add(O_ChequeTodos)
-        AddHandler O_ChequeTodos.Click, AddressOf evento
-        AddHandler O_ChequeTodos.CheckedChanged, AddressOf Colorevento
-
+        If Not Existe Then
+            P_flpObjeto.Controls.Add(O_ChequeTodos)
+            AddHandler O_ChequeTodos.Click, AddressOf evento
+            AddHandler O_ChequeTodos.CheckedChanged, AddressOf Colorevento
+        End If
 
         For Each RecorrerDatos In Datos
             Col_Generica.Add(RecorrerDatos.Key)
             Dim O_Check As New CheckBox
-            Dim Existe As Boolean = False
+            Existe = False
             Dim Nombre = RecorrerDatos.Value
 
 
@@ -633,11 +640,11 @@ Public Class frmPIN
 
 
 
-        'HabilitarBusqueda()
+        HabilitarBusqueda()
 
         ControlCambio()
         frmProgreso.PgbProgreso.Value = 85
-        'ConfiguracionInicial()
+        ConfiguracionInicial()
 
 
 
@@ -3960,48 +3967,48 @@ Public Class frmPIN
 
     Sub ConfiguracionInicial()
 
-        'For Each Items In pnlContenedor.Controls
+        For Each Items In pnlContenedor.Controls
 
 
-        '    If TypeOf Items Is GroupBox Then
+            If TypeOf Items Is GroupBox Then
 
 
-        '        Dim W_Tamgrp As Double = Items.Parent.Width - 10
-        '        Dim W_Tamflp As Double = W_Tamgrp - 10
+                Dim W_Tamgrp As Double = Items.Parent.Width - 10
+                Dim W_Tamflp As Double = W_Tamgrp - 10
 
-        '        Dim H_Tamgrp As Double = Items.Parent.Height - 30
-        '        Dim H_Tamflp As Double = H_Tamgrp - 30
+                Dim H_Tamgrp As Double = Items.Parent.Height - 30
+                Dim H_Tamflp As Double = H_Tamgrp - 30
 
 
-        '        Items.Width = W_Tamgrp
-        '        Items.Height = H_Tamgrp
-        '        Items.Location = New Point(2, 20)
+                Items.Width = W_Tamgrp
+                Items.Height = H_Tamgrp
+                Items.Location = New Point(2, 20)
 
 
-        '        For Each flItem In Items.Controls
+                For Each flItem In Items.Controls
 
-        '            If TypeOf flItem Is FlowLayoutPanel Then
-        '                flItem.Width = W_Tamflp
-        '                flItem.Height = H_Tamflp - 10
-        '            End If
+                    If TypeOf flItem Is FlowLayoutPanel Then
+                        flItem.Width = W_Tamflp
+                        flItem.Height = H_Tamflp - 10
+                    End If
 
 
-        '        Next
+                Next
 
 
 
 
-        '        For Each item In Items.Controls
+                For Each item In Items.Controls
 
-        '            If TypeOf item Is CheckBox Then
-        '                Dim W_Tamchk As Double = item.Width + 5
-        '                item.Width = W_Tamchk
+                    If TypeOf item Is CheckBox Then
+                        Dim W_Tamchk As Double = item.Width + 5
+                        item.Width = W_Tamchk
 
-        '            End If
+                    End If
 
-        '        Next
-        '    End If
-        'Next
+                Next
+            End If
+        Next
 
     End Sub
 

Dosya farkı çok büyük olduğundan ihmal edildi
+ 92 - 470
frmPrincipal.Designer.vb


+ 97 - 94
frmPrincipal.resx

@@ -123,103 +123,19 @@
   <metadata name="ToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>125, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="NewToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAELSURBVDhPrZDJasJQGIXzUvoO9TX0jcQuSulCLUUECwot
-        KtrSAbQWRDTg0CLBCY1xqmkcYo7c8ItJYy9Z+MHhLu453+IXzkbypY6/SeRriKXLiKaKZqh6Gjb4j+v4
-        M7y+AF9y/yRS3UkomkbmvcaXxLMVqjsJhh/N8SE0sXP38El1J1t9Z0oOIprYiSQLVLdjGAZUbYOhopoC
-        z4X/tOAm8UoTO+uNjslcgzSY8wVXsTxNjug7Awt1jb68RFOa8AWXtxmaHdFWW8jTX7R7M1RbMl/APq2w
-        w81+VugMF6i3FZTEgXuB9XBfnSkqjRHeyl33AuvhxO8xitU+ch+SOwF7eeEK2Keb0OQcCMIe3/X1lqrb
-        NIsAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="OpenToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJYSURBVDhPvZFbSBNQHIf30ENPFmlRCEWWhD0MA0Oqh5Ck
-        m6KUZoWRJpS3LhiKbVPbvE53c+pKh7lN19RptTIMK4RCkQgtdZSYmgVFpZgZKnn7GptokkEP0R9+L+ec
-        7zs/zhH8l8kpMSPTWriSbyJPZ0WiNDK/9XcTnawjLF7lhC6IKsh0yFKyDUQllyCoN2tYLo218j/ekiAp
-        JTxRRWh8oUvQ22VkcrTOmR8jFqaHDFhNKmzm7GUlYQlqQuO0BMcWI6irVDMxUr0Env1UyrQ9ieqKfKrK
-        cjGUZKIvzOC6UkyxPHWptMaoYOKLcQGec8D0isEeu2x+E9wsl/P9o34BbqpXOPPAWkCDRc6dqlyshiws
-        ehkm3VVuaNMoU4vRKUQuWZU+l7F3Rc7aAy1SbNVqZgdkMJi9NG8da/0S6EmGV4l01kZwKSYEgUGXxbe+
-        fHiv5G6NiraHStehX6u/jIL2cGZag5h8FMCbSiHnTx9wCcq1Ur6+ljHYmo7NomSuXwrdcS6wM8YBnmCm
-        LYTJ5v2MNe5huH4HsnhvTgZ6uN6iVJ3OcJeIW2YFHU8dTXqSHIKz0HGKuWdHmHpyiPGmvYzY/Phc40N7
-        zmoig7zw2+bmEugKxHQ3Z3DbXAB9GfDCUff5MaZaghl/HMBogz9DViEfjFuxK92Rxm7Bd7vn4k8U5aVS
-        Z8rHfi+Bdo1gIW3KFTTLV3I/cxW1aWsxpHpy7fImIg9vxt9346JAk52CRnqOPFE0kovHnQ9zJiKQowd3
-        sW+3kJ1Cb3y8PNm4wYN1a9xY7z5f/d+MQPATMS7uX9kMtOAAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="SaveToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIvSURBVDhPrZLdS9NRGMd//0L33QRddFtTYzgXq8GvXENZ
-        Ngwrwl5+kWZpukwTFSvTqPkG2QqXTlqtJuGkIl/AFCkRZSpZmrmiJQ41xSaCwdfznP3yuIouogeem8P5
-        fM55XqT/Es+fhUHpa11Ci3cRD93zaGoM4a5jGnW1X2C/FcD18kmUloyjsOAt8nJHcP6cHyouSQR2dQK1
-        NSv4WyyvrMKU2oVDqU95qrgkeZ8scEFlxTf16u9BcGh+GbssL6DRKLAe9AiB+8EcF5SWfFWvR8dP+GNw
-        ATFmHwouTeGApVkInA0zXHDR9kFFRGyEhydC2CZ7kZM9huQkpxDU3w5yQdbZERWLxK9wnz+IzQY3FGUA
-        ZrNDCGqqP3OBcmpARf8Md/Z/wqb4Rhw+8gqJiXVCcKNyCh3tYKMEjh1/A+vRXt5tahjVTN+mlyNwN1Ks
-        LyHLdiG4UjaBNh/YDgDNrh9s7t9Rfm2WN5UaRjVnZvjX4f3JrTAaK4TgcuEYPI+A+85VtjhhmNKyo9KS
-        bkPamaIInMTgfR4YDGVCYMsbZTBQXRXmLxNE5zE6GYPvZzA6OQsl9yr2mFo4rNvtgl5fJAS0lo47WP82
-        CQg+nX8T7wJzCEwv4kKxHbEGF4ObEJtwD7r4fCHIzBhidS9xeKvRgy07ZDxu64GvvQ8d3f3ofT2IvWYr
-        NPoGxDF4u7YeWm1OtODkiR6+nrRhtCQ0ZxoVdZsaRjXTq5QE74zLEoJ/D0laA2xoOmtG+TV7AAAAAElF
-        TkSuQmCC
-</value>
-  </data>
-  <data name="PrintToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIqSURBVDhPrZL7T1JxAMVZP/b/tLa2Wm21mail1YZlRjid
-        k6JhTApClhGmktrDWlKjK3OBDrLAMWJaY9MZZJbo0umWQIEFXRPQMB6ne788HFpbW322s93d3fM598X5
-        7xjtUxh0vId5dOaPMY14kL18O6zgrcePrWz8TMIbWMGgbQIlZy6DW31pu4Qts0ml0gjRETjdH0iGHC4Y
-        LONwz/hQJVITQbZSiN7qxsfPdHYzA7u8Go1jdnEZJruLLP92XWsaB5sks+4LhgvWbc5puDxeVDaocOSs
-        HBrtM9zps21KFJ1PSHnENZ9fzS0HwzHML4XRa3CglC+Dsqsfj0xjKGVEpNzUpof6/hAoyxs8MDqhf/4a
-        tyk7rt4yQtyiBb+xA+U1ChSfluLkuevo1lkhUWlRnHuMm49fIBKLk+WtJJIprMcT5E6+0uv49CUKeTuF
-        OmkXcweyjEB1zwzLq3d46nCDMr/E3b5hqHsGIGvXQdTcA8HFDvAaWnBUIEfRKQnOM+cqhdew/7goI1B2
-        D8AfCGU3C4msbcAbXMVOcEh2UBzwxW0oqZZi1+GajKC504DpuSUw7ywPe/wtmsCcfw1jszQpW7OCY7UK
-        7KsQbgqUGgqaXhN8oTjoWBqB72ksLqcwsfADw5NR9DtXSDGXQzwxKecF9ZJWyG7oMDrpJ9/2b1IgYJGo
-        HqKiTokywRVwmd+0qKoJB3mNOHDiAvaWC7GnrB67ubX5YkH53+BwfgHgHTGbZU7qDAAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="PrintPreviewToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPrZDdS1NhAIf3z4RXXkRqEd5IoCaKROWc6YVN
-        XMQkMFToZjcpQaatoVuiq+UkTTrFWR/OyuWmNaGoYDLtIkHUKfOjSJxuc0/7OHObx4+bHvjxvhe/33MO
-        r+K/IDpn2B9hzMOQ/RtW21Q8UvVgYoPD6B3+SF5J3dGSF45pqS6ny2pndNJztGT43Q+pLsfw5G18nIw0
-        yeTpmy9SPUUouMX45DjGRxZu39NzR99Ffpn6YEG/6JZmCba3txBHRnjvnMDnX2V+2Y9VEFFrm6jR3pJL
-        zIJLmiZwTLiwO5zxeygMfwO7LK2HMZifoarVyAU9Q2PxcpJus4XFFf/eePl3iNnFIDbXDJXV1XJB98Co
-        NE3QaexhYWUtMd4IR8c7uGcDPHzu5mJFhVwQe+l0BNGGaHfg24h+eSnI558BXn/dpKFFR2VVFfrWpkxJ
-        uiASifBrbo67nQb6Bl/x0uXFJLhpaNahVF1m8H4NoulGpiRdsBMMs/4ngMfr5YHRiOa6lqt19VxRXsBw
-        8xy+x0XsfqrF0tGYkiQFsfOwtLa1c60sh++6XBZMBazZlDRrylOC3PPqY1NYcglN6Sk+tJyhvjgbVelp
-        +YMeR+wv8k9mUXz2RHSsUPwDd10kHqNu+GEAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="HelpToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKWSURBVDhPjZJbSNNRHMf3HPRcYu+9Gb32VhAJ9RASlOBb
-        b2aIFop5GXPeyrmp8zLNec01HbmpqJvabjbndHl3JTmGbk7zroUXKD79N5XMFPzCjwMHPp9zzu/8ROdF
-        3eChpGSc7OxBsrIcHG1fLCE4VBMT69TVz6J5P4NUekHRMexyrVOumsBqW+OjOUC/eR5tiwdJtvN80Wm4
-        q3sZh+MnA9YdbNYt+vvW0esXaWqeFm409K/oNNzRGcRi3qKnZ5X2jmXaBLBVN09T4xwqlQe5fIycvKFD
-        wWlYbwiEQYMhSIt2gcZGLzU1s5SXT6NQjJKfP8KLZDMJz42caNhmGNa2zKPTLaB556O+bo6W9gCy1k1i
-        S/eJke0gqQkgL58k/pkRffvgoUDbOoVc4aauwcvb6q9UlnlQlkyh1gVJ0kKVFT4vCOWHevsvHuf5aTN7
-        mPP7EIklNrS6SSRSO7LiYWRFo7wpdFPb7CVRA7phWFzaJqPAxL0n6vBqcO1yJ9FNodKF6GWKEd9yAJNl
-        jLT0PsRiW/jPc5tWUFkI5xgeGfOH19J6J1LNEnHxJkQZWRqKlb0sbQeZXxXeV2JBmmvnYcEGhrFDQSih
-        W4QEtx5UUtE8StPAARHXKxC9LhoSTu4XyojZMcXGwXeszi9EiwPoTwh2fuyH4ZQcE3MrQi8se1yJzP87
-        B5IcO+mZfRSX2fAGF1B1LyLv3D3CwSmcLq9x4RXgKaGZyaUeomPU/09keqaZV4Koy/KNu8njdLkP2PsN
-        xk9+om4XM7MIFV1rXL6pJE9pOXukM8UWUtN6aWib4UasCXGtD61jj2brLkmKGS5FKUhI/cDAaOBswXFU
-        1W6KlE7inrYTcS2Xq5EZ3H9UhUxlY2gyKMAi0R+3BHAuvd7mVQAAAABJRU5ErkJggg==
-</value>
-  </data>
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>336, 17</value>
   </metadata>
   <metadata name="mnuPrincipal.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>660, 17</value>
   </metadata>
+  <metadata name="mnuPrincipal.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>660, 17</value>
+  </metadata>
+  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>428, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="picLogo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABDgAAAJoCAYAAACDTlFCAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -710,9 +626,96 @@
         RERERET1tGGT/w9rzhbMxHU7wwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>428, 17</value>
-  </metadata>
+  <data name="NewToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAELSURBVDhPrZDJasJQGIXzUvoO9TX0jcQuSulCLUUECwot
+        KtrSAbQWRDTg0CLBCY1xqmkcYo7c8ItJYy9Z+MHhLu453+IXzkbypY6/SeRriKXLiKaKZqh6Gjb4j+v4
+        M7y+AF9y/yRS3UkomkbmvcaXxLMVqjsJhh/N8SE0sXP38El1J1t9Z0oOIprYiSQLVLdjGAZUbYOhopoC
+        z4X/tOAm8UoTO+uNjslcgzSY8wVXsTxNjug7Awt1jb68RFOa8AWXtxmaHdFWW8jTX7R7M1RbMl/APq2w
+        w81+VugMF6i3FZTEgXuB9XBfnSkqjRHeyl33AuvhxO8xitU+ch+SOwF7eeEK2Keb0OQcCMIe3/X1lqrb
+        NIsAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="OpenToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJYSURBVDhPvZFbSBNQHIf30ENPFmlRCEWWhD0MA0Oqh5Ck
+        m6KUZoWRJpS3LhiKbVPbvE53c+pKh7lN19RptTIMK4RCkQgtdZSYmgVFpZgZKnn7GptokkEP0R9+L+ec
+        7zs/zhH8l8kpMSPTWriSbyJPZ0WiNDK/9XcTnawjLF7lhC6IKsh0yFKyDUQllyCoN2tYLo218j/ekiAp
+        JTxRRWh8oUvQ22VkcrTOmR8jFqaHDFhNKmzm7GUlYQlqQuO0BMcWI6irVDMxUr0Env1UyrQ9ieqKfKrK
+        cjGUZKIvzOC6UkyxPHWptMaoYOKLcQGec8D0isEeu2x+E9wsl/P9o34BbqpXOPPAWkCDRc6dqlyshiws
+        ehkm3VVuaNMoU4vRKUQuWZU+l7F3Rc7aAy1SbNVqZgdkMJi9NG8da/0S6EmGV4l01kZwKSYEgUGXxbe+
+        fHiv5G6NiraHStehX6u/jIL2cGZag5h8FMCbSiHnTx9wCcq1Ur6+ljHYmo7NomSuXwrdcS6wM8YBnmCm
+        LYTJ5v2MNe5huH4HsnhvTgZ6uN6iVJ3OcJeIW2YFHU8dTXqSHIKz0HGKuWdHmHpyiPGmvYzY/Phc40N7
+        zmoig7zw2+bmEugKxHQ3Z3DbXAB9GfDCUff5MaZaghl/HMBogz9DViEfjFuxK92Rxm7Bd7vn4k8U5aVS
+        Z8rHfi+Bdo1gIW3KFTTLV3I/cxW1aWsxpHpy7fImIg9vxt9346JAk52CRnqOPFE0kovHnQ9zJiKQowd3
+        sW+3kJ1Cb3y8PNm4wYN1a9xY7z5f/d+MQPATMS7uX9kMtOAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="SaveToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIvSURBVDhPrZLdS9NRGMd//0L33QRddFtTYzgXq8GvXENZ
+        Ngwrwl5+kWZpukwTFSvTqPkG2QqXTlqtJuGkIl/AFCkRZSpZmrmiJQ41xSaCwdfznP3yuIouogeem8P5
+        fM55XqT/Es+fhUHpa11Ci3cRD93zaGoM4a5jGnW1X2C/FcD18kmUloyjsOAt8nJHcP6cHyouSQR2dQK1
+        NSv4WyyvrMKU2oVDqU95qrgkeZ8scEFlxTf16u9BcGh+GbssL6DRKLAe9AiB+8EcF5SWfFWvR8dP+GNw
+        ATFmHwouTeGApVkInA0zXHDR9kFFRGyEhydC2CZ7kZM9huQkpxDU3w5yQdbZERWLxK9wnz+IzQY3FGUA
+        ZrNDCGqqP3OBcmpARf8Md/Z/wqb4Rhw+8gqJiXVCcKNyCh3tYKMEjh1/A+vRXt5tahjVTN+mlyNwN1Ks
+        LyHLdiG4UjaBNh/YDgDNrh9s7t9Rfm2WN5UaRjVnZvjX4f3JrTAaK4TgcuEYPI+A+85VtjhhmNKyo9KS
+        bkPamaIInMTgfR4YDGVCYMsbZTBQXRXmLxNE5zE6GYPvZzA6OQsl9yr2mFo4rNvtgl5fJAS0lo47WP82
+        CQg+nX8T7wJzCEwv4kKxHbEGF4ObEJtwD7r4fCHIzBhidS9xeKvRgy07ZDxu64GvvQ8d3f3ofT2IvWYr
+        NPoGxDF4u7YeWm1OtODkiR6+nrRhtCQ0ZxoVdZsaRjXTq5QE74zLEoJ/D0laA2xoOmtG+TV7AAAAAElF
+        TkSuQmCC
+</value>
+  </data>
+  <data name="PrintToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIqSURBVDhPrZL7T1JxAMVZP/b/tLa2Wm21mail1YZlRjid
+        k6JhTApClhGmktrDWlKjK3OBDrLAMWJaY9MZZJbo0umWQIEFXRPQMB6ne788HFpbW322s93d3fM598X5
+        7xjtUxh0vId5dOaPMY14kL18O6zgrcePrWz8TMIbWMGgbQIlZy6DW31pu4Qts0ml0gjRETjdH0iGHC4Y
+        LONwz/hQJVITQbZSiN7qxsfPdHYzA7u8Go1jdnEZJruLLP92XWsaB5sks+4LhgvWbc5puDxeVDaocOSs
+        HBrtM9zps21KFJ1PSHnENZ9fzS0HwzHML4XRa3CglC+Dsqsfj0xjKGVEpNzUpof6/hAoyxs8MDqhf/4a
+        tyk7rt4yQtyiBb+xA+U1ChSfluLkuevo1lkhUWlRnHuMm49fIBKLk+WtJJIprMcT5E6+0uv49CUKeTuF
+        OmkXcweyjEB1zwzLq3d46nCDMr/E3b5hqHsGIGvXQdTcA8HFDvAaWnBUIEfRKQnOM+cqhdew/7goI1B2
+        D8AfCGU3C4msbcAbXMVOcEh2UBzwxW0oqZZi1+GajKC504DpuSUw7ywPe/wtmsCcfw1jszQpW7OCY7UK
+        7KsQbgqUGgqaXhN8oTjoWBqB72ksLqcwsfADw5NR9DtXSDGXQzwxKecF9ZJWyG7oMDrpJ9/2b1IgYJGo
+        HqKiTokywRVwmd+0qKoJB3mNOHDiAvaWC7GnrB67ubX5YkH53+BwfgHgHTGbZU7qDAAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="PrintPreviewToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPrZDdS1NhAIf3z4RXXkRqEd5IoCaKROWc6YVN
+        XMQkMFToZjcpQaatoVuiq+UkTTrFWR/OyuWmNaGoYDLtIkHUKfOjSJxuc0/7OHObx4+bHvjxvhe/33MO
+        r+K/IDpn2B9hzMOQ/RtW21Q8UvVgYoPD6B3+SF5J3dGSF45pqS6ny2pndNJztGT43Q+pLsfw5G18nIw0
+        yeTpmy9SPUUouMX45DjGRxZu39NzR99Ffpn6YEG/6JZmCba3txBHRnjvnMDnX2V+2Y9VEFFrm6jR3pJL
+        zIJLmiZwTLiwO5zxeygMfwO7LK2HMZifoarVyAU9Q2PxcpJus4XFFf/eePl3iNnFIDbXDJXV1XJB98Co
+        NE3QaexhYWUtMd4IR8c7uGcDPHzu5mJFhVwQe+l0BNGGaHfg24h+eSnI558BXn/dpKFFR2VVFfrWpkxJ
+        uiASifBrbo67nQb6Bl/x0uXFJLhpaNahVF1m8H4NoulGpiRdsBMMs/4ngMfr5YHRiOa6lqt19VxRXsBw
+        8xy+x0XsfqrF0tGYkiQFsfOwtLa1c60sh++6XBZMBazZlDRrylOC3PPqY1NYcglN6Sk+tJyhvjgbVelp
+        +YMeR+wv8k9mUXz2RHSsUPwDd10kHqNu+GEAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="HelpToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKWSURBVDhPjZJbSNNRHMf3HPRcYu+9Gb32VhAJ9RASlOBb
+        b2aIFop5GXPeyrmp8zLNec01HbmpqJvabjbndHl3JTmGbk7zroUXKD79N5XMFPzCjwMHPp9zzu/8ROdF
+        3eChpGSc7OxBsrIcHG1fLCE4VBMT69TVz6J5P4NUekHRMexyrVOumsBqW+OjOUC/eR5tiwdJtvN80Wm4
+        q3sZh+MnA9YdbNYt+vvW0esXaWqeFm409K/oNNzRGcRi3qKnZ5X2jmXaBLBVN09T4xwqlQe5fIycvKFD
+        wWlYbwiEQYMhSIt2gcZGLzU1s5SXT6NQjJKfP8KLZDMJz42caNhmGNa2zKPTLaB556O+bo6W9gCy1k1i
+        S/eJke0gqQkgL58k/pkRffvgoUDbOoVc4aauwcvb6q9UlnlQlkyh1gVJ0kKVFT4vCOWHevsvHuf5aTN7
+        mPP7EIklNrS6SSRSO7LiYWRFo7wpdFPb7CVRA7phWFzaJqPAxL0n6vBqcO1yJ9FNodKF6GWKEd9yAJNl
+        jLT0PsRiW/jPc5tWUFkI5xgeGfOH19J6J1LNEnHxJkQZWRqKlb0sbQeZXxXeV2JBmmvnYcEGhrFDQSih
+        W4QEtx5UUtE8StPAARHXKxC9LhoSTu4XyojZMcXGwXeszi9EiwPoTwh2fuyH4ZQcE3MrQi8se1yJzP87
+        B5IcO+mZfRSX2fAGF1B1LyLv3D3CwSmcLq9x4RXgKaGZyaUeomPU/09keqaZV4Koy/KNu8njdLkP2PsN
+        xk9+om4XM7MIFV1rXL6pJE9pOXukM8UWUtN6aWib4UasCXGtD61jj2brLkmKGS5FKUhI/cDAaOBswXFU
+        1W6KlE7inrYTcS2Xq5EZ3H9UhUxlY2gyKMAi0R+3BHAuvd7mVQAAAABJRU5ErkJggg==
+</value>
+  </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>52</value>
   </metadata>

+ 15 - 251
frmPrincipal.vb

@@ -99,7 +99,7 @@ Public Class frmPrincipal
     Private Sub frmPrincipal_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
         Me.ToolStrip.Visible = False
-        Listas()
+
         Me.mnuPrincipal.Renderer = New MenuPrincipalRender()
         ''inicio()
 
@@ -140,7 +140,7 @@ Public Class frmPrincipal
     End Sub
 
     Private Sub mnuInicio_Click(sender As Object, e As EventArgs) Handles mnuInicio.Click
-        inicio()
+        frmPrincipalInicio.ShowDialog()
     End Sub
 
     Private Sub mnuPropuestas_Click(sender As Object, e As EventArgs) Handles mnuPropuestas.Click
@@ -324,123 +324,16 @@ Public Class frmPrincipal
     End Sub
 
 
-    Sub Listas()
-        Fuente()
-        DefinirTam()
-        ListaEmpresas()
-        ListaInstrumentos()
-        ListaPaises()
-        GraficaInstrumentos()
-        GraficaMontoInstrumentos()
-        GraficaRendimientoInstrumentos()
-        RendimientoMonto()
-    End Sub
-
-    Sub Fuente()
-        lblTitulo.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
-        lblRendimiento.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
-        lblIngreso.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
-        lblPortafolio.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
-
-
-
-        lblMontoIngresos.ForeColor = Drawing.Color.FromArgb(237, 51, 50)
-        lblIngresostexto.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
-        lblMontoRendimiento.ForeColor = Drawing.Color.FromArgb(237, 51, 50)
-        lblRendimientotexto.ForeColor = Drawing.Color.FromArgb(15, 151, 208)
-    End Sub
-
-    Sub ListaEmpresas()
-        Dim General As New DAOGeneral
-        Dim Empresas As DataTable = General.ListaEmpresas
-        For Each row As DataRow In Empresas.Rows
-            Dim Boton As New Button
-            Boton.Text = CStr(row("Descripcion"))
-            Boton.Name = CStr(row("Codigo"))
-            Boton.Width = flpEmpresas.Width - 20
-            'Boton.FlatStyle = FlatStyle.Flat
-            Boton.ForeColor = Drawing.Color.FromArgb(40, 47, 59)
-            Boton.BackColor = Drawing.Color.FromArgb(15, 151, 208)
-            Boton.Height = 30
-            Boton.TextAlign = ContentAlignment.MiddleLeft
-            Boton.Font = New Font(Boton.Font.Name, 10)
-            Boton.Margin = New Padding(0)
-            flpEmpresas.Controls.Add(Boton)
-        Next
-
-
-
-
-
-
-    End Sub
-
-    Sub ListaInstrumentos()
-        Dim General As New DAOGeneral
-        Dim Instrumentos As DataTable = General.ListaInstrumentos
-        For Each row As DataRow In Instrumentos.Rows
-            Dim Boton As New Button
-            Boton.Text = CStr(row("Descripcion"))
-            Boton.Name = CStr(row("Codigo"))
-            Boton.Width = flpEmpresas.Width - 20
-            'Boton.FlatStyle = FlatStyle.Flat
-            Boton.ForeColor = Drawing.Color.FromArgb(40, 47, 59)
-            Boton.BackColor = Drawing.Color.FromArgb(15, 151, 208)
-            Boton.Height = 30
-            Boton.TextAlign = ContentAlignment.MiddleLeft
-            Boton.Font = New Font(Boton.Font.Name, 10)
-            Boton.Margin = New Padding(0)
-            flpInstrumentos.Controls.Add(Boton)
-        Next
-    End Sub
-
-
-    Sub ListaPaises()
-        Dim General As New DAOGeneral
-        Dim Paises As DataTable = General.ListaPaisesRelevanteInversion
-        For Each row As DataRow In Paises.Rows
-            Dim Boton As New Button
-            Boton.Text = CStr(row("Descripcion"))
-            Boton.Name = CStr(row("Codigo"))
-            Boton.Width = flpEmpresas.Width - 20
-            'Boton.FlatStyle = FlatStyle.Flat
-            Boton.ForeColor = Drawing.Color.FromArgb(40, 47, 59)
-            Boton.BackColor = Drawing.Color.FromArgb(15, 151, 208)
-            Boton.Height = 30
-            Boton.TextAlign = ContentAlignment.MiddleLeft
-            Boton.Font = New Font(Boton.Font.Name, 10)
-            Boton.Margin = New Padding(0)
-            flpPaises.Controls.Add(Boton)
-        Next
-    End Sub
-
 
 
-    Sub DefinirTam()
-        Dim TamEmpresa As Double = lblEmpresa.Width * 3
 
 
-        pnlEmpresa.Width = TamEmpresa
-        pnlInstrumento.Width = TamEmpresa
-        pnlPais.Width = TamEmpresa
 
 
-        pnlEmpresa.Height = 300
-        pnlInstrumento.Height = 300
-        pnlPais.Height = 300
 
-        flpEmpresas.Width = TamEmpresa - 5
-        flpInstrumentos.Width = TamEmpresa - 5
-        flpPaises.Width = TamEmpresa - 5
 
-        flpEmpresas.Height = 295
-        flpInstrumentos.Height = 295
-        flpPaises.Height = 295
 
 
-
-    End Sub
-
     Private Sub Button2_Click_1(sender As Object, e As EventArgs)
 
     End Sub
@@ -449,186 +342,53 @@ Public Class frmPrincipal
 
     End Sub
 
-    Sub GraficaInstrumentos()
-        Dim general As New DAOGeneral
-        Dim dt As DataTable = general.InstrumentosGrafica
-
-
-
-        charPastel.Series(0).Points.Clear()
-        charPastel.Series(0).IsValueShownAsLabel = False
-        charPastel.Series(0).LabelForeColor = Color.Transparent
-        'charPastel.Series(0).LabelAngle = -45
-
-        'charPastel.Series(0).Font = New Font(charPastel.Series(0).Font.Name, 5)
-
-        'charPastel.ChartAreas(0).Area3DStyle.Enable3D = True
-
-        charPastel.Series(0).XValueMember = "Instrumento"
-        charPastel.Series(0).YValueMembers = "Cantidad"
-
-        charPastel.DataSource = dt
-    End Sub
-
-    Sub GraficaMontoInstrumentos()
-        Dim general As New DAOGeneral
 
-        Dim dt As DataTable = general.MontosInstrumentosGrafica
-        charbarras.Series(0).Points.Clear()
-        'charbarras.ChartAreas(0).Area3DStyle.Enable3D = True
 
 
-        charbarras.Series(0).XValueMember = "Instrumento"
-        charbarras.Series(0).YValueMembers = "Suma"
-        charbarras.DataSource = dt
-    End Sub
-
-
-    Sub GraficaRendimientoInstrumentos()
-        Dim general As New DAOGeneral
-
-        Dim dt As DataTable = general.RendimientosInstrumentoGrafica
-        charlineal.Series(0).Points.Clear()
-
-
-
-        charlineal.Series(0).XValueMember = "Instrumento"
-        charlineal.Series(0).YValueMembers = "Suma"
-        charlineal.DataSource = dt
-    End Sub
-
 
 
 
-    Sub RendimientoMonto()
-        Dim general As New DAOGeneral
-        Dim Monto As String = "0.00"
-        Dim Cantidad As Integer = 0
-        Dim Rendimiento As String = "0.00 "
-        Dim dt As DataTable = general.RendimientoMontoGraficas
-        For Each rows As DataRow In dt.Rows
-            If Not String.IsNullOrEmpty(rows("Rendimiento").ToString) Then
-                Rendimiento = rows("Rendimiento").ToString
-            End If
-
-            If Not String.IsNullOrEmpty(rows("Monto").ToString) Then
-                Monto = rows("Monto").ToString
-            End If
-
-            If Not String.IsNullOrEmpty(rows("Cantidad").ToString) Then
-                Cantidad = rows("Cantidad")
-            End If
-        Next
-
-        lblMontoIngresos.Text = "$ " + Monto
-        If Cantidad = 0 Then
-            lblMontoRendimiento.Text = "0 %"
-        Else
-
-            lblMontoRendimiento.Text = FormatNumber((((CDec(Rendimiento) / Cantidad)) * 100), 6).ToString + " %"
-        End If
-    End Sub
 
     Private Sub ToolStrip_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) Handles ToolStrip.ItemClicked
 
     End Sub
 
-    Sub EventEmpresa()
-        If lblEmpresa.ForeColor.Name = Drawing.Color.FromArgb(237, 168, 59).Name Then
-            lblEmpresa.ForeColor = Color.WhiteSmoke
-            lblInstrumento.ForeColor = Drawing.Color.FromArgb(237, 168, 59)
-            lblPais.ForeColor = Drawing.Color.FromArgb(237, 168, 59)
-
-
-
-            pnlEmpresa.Visible = True
-            pnlInstrumento.Visible = False
-            pnlPais.Visible = False
-
-        Else
-
-            lblEmpresa.ForeColor = Drawing.Color.FromArgb(237, 168, 59)
-            pnlEmpresa.Visible = False
-
-        End If
-
-    End Sub
-
 
-    Sub EventInstrumento()
-        If lblInstrumento.ForeColor.Name = Drawing.Color.FromArgb(237, 168, 59).Name Then
-            lblInstrumento.ForeColor = Color.WhiteSmoke
-            lblEmpresa.ForeColor = Drawing.Color.FromArgb(237, 168, 59)
-            lblPais.ForeColor = Drawing.Color.FromArgb(237, 168, 59)
 
 
 
-            pnlInstrumento.Visible = True
-            pnlEmpresa.Visible = False
-            pnlPais.Visible = False
 
-        Else
 
-            lblInstrumento.ForeColor = Drawing.Color.FromArgb(237, 168, 59)
-            pnlInstrumento.Visible = False
 
-        End If
+    Private Sub lblEmpresa_MouseHover(sender As Object, e As EventArgs) 
 
     End Sub
 
-
-    Sub EventPais()
-        If lblPais.ForeColor.Name = Drawing.Color.FromArgb(237, 168, 59).Name Then
-            lblPais.ForeColor = Color.WhiteSmoke
-            lblInstrumento.ForeColor = Drawing.Color.FromArgb(237, 168, 59)
-            lblEmpresa.ForeColor = Drawing.Color.FromArgb(237, 168, 59)
-
-
-
-            pnlPais.Visible = True
-            pnlInstrumento.Visible = False
-            pnlEmpresa.Visible = False
-
-        Else
-
-            lblPais.ForeColor = Drawing.Color.FromArgb(237, 168, 59)
-            pnlPais.Visible = False
-
-        End If
+    Private Sub lblEmpresa_MouseLeave(sender As Object, e As EventArgs) 
 
     End Sub
 
-
-
-    Private Sub lblEmpresa_MouseHover(sender As Object, e As EventArgs) Handles lblEmpresa.MouseHover
+    Private Sub lblEmpresa_MouseEnter(sender As Object, e As EventArgs) 
 
     End Sub
 
-    Private Sub lblEmpresa_MouseLeave(sender As Object, e As EventArgs) Handles lblEmpresa.MouseLeave
+    Private Sub pnlEmpresa_MouseEnter(sender As Object, e As EventArgs) 
 
     End Sub
 
-    Private Sub lblEmpresa_MouseEnter(sender As Object, e As EventArgs) Handles lblEmpresa.MouseEnter
+    Private Sub lblEmpresa_Click(sender As Object, e As EventArgs)
 
     End Sub
 
-    Private Sub pnlEmpresa_MouseEnter(sender As Object, e As EventArgs) Handles pnlEmpresa.MouseEnter
+    Private Sub lblInstrumento_Click(sender As Object, e As EventArgs)
 
     End Sub
 
-    Private Sub lblEmpresa_Click(sender As Object, e As EventArgs) Handles lblEmpresa.Click
-        EventEmpresa()
-    End Sub
+    Private Sub lblPais_Click(sender As Object, e As EventArgs)
 
-    Private Sub lblInstrumento_Click(sender As Object, e As EventArgs) Handles lblInstrumento.Click
-        EventInstrumento()
     End Sub
 
-    Private Sub lblPais_Click(sender As Object, e As EventArgs) Handles lblPais.Click
-        EventPais()
-    End Sub
-
-    Private Sub pnlHijo_Paint(sender As Object, e As PaintEventArgs) Handles pnlHijo.Paint
+    Private Sub pnlHijo_Paint(sender As Object, e As PaintEventArgs)
 
     End Sub
 
@@ -636,7 +396,7 @@ Public Class frmPrincipal
 
     End Sub
 
-    Private Sub lblMontoRendimiento_Click(sender As Object, e As EventArgs) Handles lblMontoRendimiento.Click
+    Private Sub lblMontoRendimiento_Click(sender As Object, e As EventArgs)
 
     End Sub
 
@@ -647,4 +407,8 @@ Public Class frmPrincipal
     Private Sub ArbitrajeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ArbitrajeToolStripMenuItem.Click
         frmColaTitulos.Show()
     End Sub
+
+    Private Sub lblTitulo_Click(sender As Object, e As EventArgs) Handles lblTitulo.Click
+
+    End Sub
 End Class

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor