diff --git a/dist/local-release/Programa Caja.jar b/dist/local-release/Programa Caja.jar index d4f3c47..14bb6db 100644 Binary files a/dist/local-release/Programa Caja.jar and b/dist/local-release/Programa Caja.jar differ diff --git a/dist/local-release/config/app.properties b/dist/local-release/config/app.properties index 74583c0..c98d599 100644 --- a/dist/local-release/config/app.properties +++ b/dist/local-release/config/app.properties @@ -9,7 +9,7 @@ # database_uri es la uri de la base de datos con la que se conectara el sistema. # por ahora soporte solo a sqlite asi que debe ser la uri correspondiente -sqlite_database_uri = jdbc:sqlite:data/rodriguez.dat +sqlite_database_uri = jdbc:sqlite:data/local.dat # look_and_feel elige el look and feel que intentara utilizar la aplicacion, si el seleccionado no funciona en el sistema operativo se hara fallback a metal. diff --git a/src/danielcortes/xyz/controllers/InformesController.java b/src/danielcortes/xyz/controllers/InformesController.java index afeccdd..00c7178 100644 --- a/src/danielcortes/xyz/controllers/InformesController.java +++ b/src/danielcortes/xyz/controllers/InformesController.java @@ -65,10 +65,6 @@ public class InformesController { frame.setLocationRelativeTo(null); frame.setVisible(true); }); - - this.view.getSalirButton().addActionListener(e -> { - ((JFrame) this.view.getContentPanel().getParent().getParent().getParent()).dispose(); - }); } private void generarInformeLibroDeVentasListener() { diff --git a/src/danielcortes/xyz/controllers/MainController.java b/src/danielcortes/xyz/controllers/MainController.java index 9df8c3d..f2f2f57 100644 --- a/src/danielcortes/xyz/controllers/MainController.java +++ b/src/danielcortes/xyz/controllers/MainController.java @@ -36,9 +36,6 @@ public class MainController { this.executeView(view.getContentPanel(), "Informes Mensuales", new Dimension(250, 500)); }); - this.view.getSalirButton().addActionListener(e -> { - System.exit(0); - }); } private void executeView(JComponent view, String title, Dimension d){ diff --git a/src/danielcortes/xyz/views/InformesView.form b/src/danielcortes/xyz/views/InformesView.form index f760280..84dddb9 100644 --- a/src/danielcortes/xyz/views/InformesView.form +++ b/src/danielcortes/xyz/views/InformesView.form @@ -8,7 +8,7 @@ - + @@ -45,14 +45,6 @@ - - - - - - - - diff --git a/src/danielcortes/xyz/views/InformesView.java b/src/danielcortes/xyz/views/InformesView.java index cb3d10e..259dcc2 100644 --- a/src/danielcortes/xyz/views/InformesView.java +++ b/src/danielcortes/xyz/views/InformesView.java @@ -54,9 +54,6 @@ public class InformesView { return estadoResultadoButton; } - public JButton getSalirButton() { - return salirButton; - } { // GUI initializer generated by IntelliJ IDEA GUI Designer @@ -76,7 +73,7 @@ public class InformesView { contentPanel = new JPanel(); contentPanel.setLayout(new GridLayoutManager(1, 1, new Insets(10, 10, 10, 10), -1, -1)); final JPanel panel1 = new JPanel(); - panel1.setLayout(new GridLayoutManager(5, 1, new Insets(10, 10, 10, 10), -1, -1)); + panel1.setLayout(new GridLayoutManager(4, 1, new Insets(10, 10, 10, 10), -1, -1)); contentPanel.add(panel1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Informes Mensuales")); generarLibroVentasButton = new JButton(); @@ -90,9 +87,6 @@ public class InformesView { estadoResultadoButton = new JButton(); estadoResultadoButton.setText("Estado Resultado"); panel1.add(estadoResultadoButton, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); - salirButton = new JButton(); - salirButton.setText("Salir"); - panel1.add(salirButton, new GridConstraints(4, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); } /** diff --git a/src/danielcortes/xyz/views/MainView.form b/src/danielcortes/xyz/views/MainView.form index d1123e9..33075d2 100644 --- a/src/danielcortes/xyz/views/MainView.form +++ b/src/danielcortes/xyz/views/MainView.form @@ -8,7 +8,7 @@ - + @@ -37,14 +37,6 @@ - - - - - - - - diff --git a/src/danielcortes/xyz/views/MainView.java b/src/danielcortes/xyz/views/MainView.java index 92b816d..f57919a 100644 --- a/src/danielcortes/xyz/views/MainView.java +++ b/src/danielcortes/xyz/views/MainView.java @@ -35,9 +35,6 @@ public class MainView { return informesGeneralesButton; } - public JButton getSalirButton() { - return salirButton; - } { // GUI initializer generated by IntelliJ IDEA GUI Designer @@ -57,7 +54,7 @@ public class MainView { contentPanel = new JPanel(); contentPanel.setLayout(new GridLayoutManager(1, 1, new Insets(10, 10, 10, 10), -1, -1)); buttonPanel = new JPanel(); - buttonPanel.setLayout(new GridLayoutManager(4, 1, new Insets(10, 10, 10, 10), -1, -1)); + buttonPanel.setLayout(new GridLayoutManager(3, 1, new Insets(10, 10, 10, 10), -1, -1)); contentPanel.add(buttonPanel, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); buttonPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), null)); cajasButton = new JButton(); @@ -68,9 +65,6 @@ public class MainView { informesMensualesButton = new JButton(); informesMensualesButton.setText("Informes Mensuales"); buttonPanel.add(informesMensualesButton, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); - salirButton = new JButton(); - salirButton.setText("Salir"); - buttonPanel.add(salirButton, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); } /**