diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index be84445..fc52d31 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,9 +1,11 @@ { "ExpandedNodes": [ - "", - "\\Properties", - "\\Properties\\DataSources" + "" ], +<<<<<<< HEAD + "SelectedNode": "\\agregarmermas.cs", +======= "SelectedNode": "\\vender.cs", +>>>>>>> 53dd047ba99d9fe2f8dc36472f5d1441d992e695 "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/compabetoOG/v17/.wsuo b/.vs/compabetoOG/v17/.wsuo index f6f6f81..58438ad 100644 Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index c132eb9..dea406d 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 6d1a3fe..02f2f5e 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/bin/Debug/data.db b/bin/Debug/data.db index df1b99b..0055a4e 100644 Binary files a/bin/Debug/data.db and b/bin/Debug/data.db differ diff --git a/inventario.cs b/inventario.cs index 4367b30..9c39f3b 100644 --- a/inventario.cs +++ b/inventario.cs @@ -155,9 +155,9 @@ namespace compabetov2 private void button1_Click(object sender, EventArgs e) { MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal); - menuPrincipal.Show(); + menuPrincipal.ShowDialog(); - this.Dispose(); + this.Close(); } diff --git a/mermas.cs b/mermas.cs index 17c2348..1c210c5 100644 --- a/mermas.cs +++ b/mermas.cs @@ -147,7 +147,7 @@ namespace compabetov2 private void button1_Click(object sender, EventArgs e) { MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal); - menuPrincipal.Show(); + menuPrincipal.ShowDialog(); this.Dispose(true); } diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 4382aa9..7a5c292 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 eaa118c..248c243 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index 05e00e8..5cbbf72 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -103,3 +103,7 @@ C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.ModificarContra.re C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.verMerma.resources C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources +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 diff --git a/obj/Debug/compabetov2.exe b/obj/Debug/compabetov2.exe index c132eb9..dea406d 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 6d1a3fe..02f2f5e 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ diff --git a/personal.cs b/personal.cs index 46855a7..8cb068c 100644 --- a/personal.cs +++ b/personal.cs @@ -227,7 +227,7 @@ namespace compabetov2 private void button1_Click(object sender, EventArgs e) { MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal); - menuPrincipal.Show(); + menuPrincipal.ShowDialog(); this.Dispose(true); } } diff --git a/vender.cs b/vender.cs index eaaaa93..02cf259 100644 --- a/vender.cs +++ b/vender.cs @@ -363,7 +363,7 @@ namespace compabetov2 private void button1_Click(object sender, EventArgs e) { MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal); - menuPrincipal.Show(); + menuPrincipal.ShowDialog(); this.Dispose(true); }