diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ad24798..78dab64 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,21 +7,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -69,29 +59,31 @@
-
-
+
+
-
+
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
@@ -164,7 +156,6 @@
@@ -287,9 +279,7 @@
-
-
-
+
@@ -310,7 +300,7 @@
-
+
@@ -548,14 +538,7 @@
-
-
-
- 1545358591232
-
-
-
- 1545358591232
+
1545361072926
@@ -893,11 +876,18 @@
1547787772304
-
+
+ 1547847834650
+
+
+
+ 1547847834651
+
+
-
+
@@ -909,10 +899,9 @@
-
-
+
-
+
@@ -931,7 +920,7 @@
-
+
@@ -1038,7 +1027,6 @@
-
@@ -1063,21 +1051,14 @@
-
+
+
-
-
-
-
-
-
-
-
@@ -1701,10 +1682,13 @@
+
+
+
-
-
+
+
@@ -1720,7 +1704,6 @@
-
@@ -1730,8 +1713,6 @@
-
-
@@ -1772,12 +1753,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
@@ -1786,34 +1780,33 @@
-
-
-
-
-
+
+
-
+
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
diff --git a/dist/caja.jar b/dist/caja.jar
index ce4bd7c..fb55728 100644
Binary files a/dist/caja.jar and b/dist/caja.jar differ
diff --git a/dist/conf.properties b/dist/conf.properties
index f101903..7d09ff9 100644
--- a/dist/conf.properties
+++ b/dist/conf.properties
@@ -23,3 +23,6 @@ look_and_feel = javax.swing.plaf.metal.MetalLookAndFeel
#look_and_feel = com.sun.java.swing.plaf.motif.MotifLookAndFeel
#look_and_feel = com.sun.java.swing.plaf.gtk.GTKLookAndFeel
#look_and_feel = com.sun.java.swing.plaf.windows.WindowsLookAndFeel
+
+# nombre_caja sirve para darle un nombre a la caja con la que se esta trabajando, por ahora le da un nombre a las ventanas del sistema.
+nombre_caja = Rodriguez
diff --git a/src/danielcortes/xyz/Main.java b/src/danielcortes/xyz/Main.java
index 12d37f5..6fe5ab6 100644
--- a/src/danielcortes/xyz/Main.java
+++ b/src/danielcortes/xyz/Main.java
@@ -98,7 +98,7 @@ public class Main {
ManagerView view = new ManagerView();
ManagerController managerController = new ManagerController(view, cajaDAO, documentosDAO, efectivoDAO, egresoDAO, ingresoDAO, tipoEgresoDAO, tipoIngresoDAO);
- JFrame frame = new JFrame("Caja");
+ JFrame frame = new JFrame("Caja: " + Properties.getInstance().getProperty("nombre_caja"));
frame.setContentPane(view.getContentPanel());
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
diff --git a/src/danielcortes/xyz/controllers/CalcularFondoController.java b/src/danielcortes/xyz/controllers/CalcularFondoController.java
index a21c98b..bff2081 100644
--- a/src/danielcortes/xyz/controllers/CalcularFondoController.java
+++ b/src/danielcortes/xyz/controllers/CalcularFondoController.java
@@ -1,6 +1,7 @@
package danielcortes.xyz.controllers;
import danielcortes.xyz.controllers.actions.NextAction;
+import danielcortes.xyz.data.Properties;
import danielcortes.xyz.models.caja.Caja;
import danielcortes.xyz.models.calculo_fondo.CalculoFondo;
import danielcortes.xyz.models.calculo_fondo.CalculoFondoDAO;
@@ -36,7 +37,7 @@ public class CalcularFondoController {
}
private void showView() {
- JFrame frame = new JFrame("Calculo de Fondo");
+ JFrame frame = new JFrame("Calculo de Fondo: " + Properties.getInstance().getProperty("nombre_caja"));
frame.setContentPane(view.getContentPanel());
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
frame.pack();