movidas las vistas un poco para mayor claridad, eso espero, no es mi fuerte realmente

dist/local-release/config/app.properties

@@ -20,7 +20,7 @@ look_and_feel = javax.swing.plaf.metal.MetalLookAndFeel
 #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
+nombre_caja = DEV
 
 # directorio en el que sugerir donde guardar los informes.
 base_save_directory =/home/ryuuji/src/caja/dist/local-release/informes/

src/danielcortes/xyz/Main.java

@@ -24,9 +24,9 @@
 
 package danielcortes.xyz;
 
-import danielcortes.xyz.controllers.ManagerController;
+import danielcortes.xyz.controllers.MainController;
 import danielcortes.xyz.data.Configuration;
-import danielcortes.xyz.views.ManagerView;
+import danielcortes.xyz.views.MainView;
 
 import javax.swing.*;
 import java.io.FileInputStream;
@@ -45,18 +45,18 @@ public class Main {
     }
 
     private static void run() {
-        ManagerView view = new ManagerView();
+        MainView view = new MainView();
-        ManagerController managerController = new ManagerController(view);
+        MainController mainController = new MainController(view);
 
         executeView(view.getContentPanel());
     }
 
     private static void executeView(JComponent view) {
-        JFrame frame = new JFrame("Caja: " + Configuration.get("nombre_caja"));
+        JFrame frame = new JFrame(Configuration.get("nombre_caja"));
         frame.setContentPane(view);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
-        frame.pack();
+        frame.setSize(250,500);
         frame.setLocationRelativeTo(null);
         frame.setVisible(true);
     }

src/danielcortes/xyz/controllers/CajasController.java

@@ -34,16 +34,15 @@ import java.awt.*;
 import java.time.LocalDate;
 
 /**
- * Controlador destinado a controlar la vista de ManagerView
+ * Controlador destinado a controlar la vista de CajasView
  * Ademas es la que crea las vistas internas en un CardLayaut junto a sus controladores
  */
-public class ManagerController {
+public class CajasController {
-    private ManagerView view;
+    private CajasView view;
 
     private IngresosController ingresosController;
     private EgresosController egresosController;
     private ArqueoController arqueoController;
-    private InformesController informesController;
 
     /**
      * Crea el controlador
@@ -56,7 +55,7 @@ public class ManagerController {
      * - Genera los eventos de la vista
      * - Presiona el boton de la vista inicial
      */
-    public ManagerController(ManagerView view) {
+    public CajasController(CajasView view) {
         this.view = view;
         this.loadCardContents();
         this.setUpDate();
@@ -92,10 +91,6 @@ public class ManagerController {
             CardLayout layout = (CardLayout) this.view.getCardPanel().getLayout();
             layout.show(this.view.getCardPanel(), "ARQUEO");
         });
-        this.view.getInformesButton().addActionListener(e -> {
-            CardLayout layout = (CardLayout) this.view.getCardPanel().getLayout();
-            layout.show(this.view.getCardPanel(), "INFORMES");
-        });
         this.view.getDatePicker().addDateChangeListener(e -> updateCaja());
     }
 
@@ -132,7 +127,6 @@ public class ManagerController {
         this.loadEgresosView();
         this.loadIngresosView();
         this.loadArqueoView();
-        this.loadInformesView();
     }
 
     /**
@@ -168,13 +162,6 @@ public class ManagerController {
         this.arqueoController = new ArqueoController(arqueoView);
     }
 
-    private void loadInformesView() {
-        InformesView informesView = new InformesView();
-        this.view.getCardPanel().add(informesView.getContentPanel(), "INFORMES");
-
-        this.informesController = new InformesController(informesView);
-    }
-
     /**
      * Activa el primer boton del manager
      */

src/danielcortes/xyz/controllers/MainController.java

@@ -0,0 +1,52 @@
+package danielcortes.xyz.controllers;
+
+import danielcortes.xyz.data.Configuration;
+import danielcortes.xyz.views.CajasView;
+import danielcortes.xyz.views.InformesView;
+import danielcortes.xyz.views.MainView;
+
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import java.awt.*;
+
+public class MainController {
+    private MainView view;
+
+    private CajasController cajasController;
+
+    public MainController(MainView view){
+        this.view = view;
+        this.setupViewEvents();
+        this.loadRestaurantName();
+    }
+
+    private void loadRestaurantName(){
+        String nombre = Configuration.get("nombre_caja");
+        ((TitledBorder)this.view.getButtonPanel().getBorder()).setTitle("Restaurant: " + nombre);
+    }
+
+    private void setupViewEvents(){
+        this.view.getCajasButton().addActionListener(e -> {
+            CajasView view = new CajasView();
+            CajasController cajasController = new CajasController(view);
+
+            this.executeView(view.getContentPanel(), "Caja", new Dimension(1280, 720));
+        });
+        this.view.getInformesMensualesButton().addActionListener(e -> {
+            InformesView view = new InformesView();
+            InformesController informesController = new InformesController(view);
+
+            this.executeView(view.getContentPanel(), "Informes Mensuales", new Dimension(250, 500));
+        });
+    }
+
+    private void executeView(JComponent view, String title, Dimension d){
+        JFrame frame = new JFrame(title + ": " + Configuration.get("nombre_caja"));
+        frame.setContentPane(view);
+        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+        frame.setSize(d);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+}

src/danielcortes/xyz/views/CajasView.form

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="danielcortes.xyz.views.ManagerView">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="danielcortes.xyz.views.CajasView">
   <grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="20" y="20" width="628" height="307"/>
+      <xy x="20" y="20" width="649" height="307"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -16,7 +16,7 @@
         <border type="none"/>
         <children/>
       </grid>
-      <grid id="b2933" binding="controlsPanel" layout-manager="GridLayoutManager" row-count="1" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="b2933" binding="controlsPanel" layout-manager="GridLayoutManager" row-count="1" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
@@ -65,16 +65,6 @@
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
           </hspacer>
-          <component id="91b71" class="javax.swing.JToggleButton" binding="informesButton">
-            <constraints>
-              <grid row="0" column="5" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false">
-                <preferred-size width="200" height="-1"/>
-              </grid>
-            </constraints>
-            <properties>
-              <text value="Informes"/>
-            </properties>
-          </component>
         </children>
       </grid>
     </children>

src/danielcortes/xyz/views/CajasView.java

@@ -32,7 +32,7 @@ import com.intellij.uiDesigner.core.Spacer;
 import javax.swing.*;
 import java.awt.*;
 
-public class ManagerView {
+public class CajasView {
     private JToggleButton egresosButton;
     private JToggleButton ingresosButton;
     private JPanel contentPanel;
@@ -40,7 +40,6 @@ public class ManagerView {
     private JPanel controlsPanel;
     private JToggleButton arqueoButton;
     private DatePicker datePicker;
-    private JToggleButton informesButton;
 
     public JToggleButton getEgresosButton() {
         return egresosButton;
@@ -54,10 +53,6 @@ public class ManagerView {
         return arqueoButton;
     }
 
-    public JToggleButton getInformesButton() {
-        return informesButton;
-    }
-
     public DatePicker getDatePicker() {
         return datePicker;
     }
@@ -92,7 +87,7 @@ public class ManagerView {
         cardPanel.setLayout(new CardLayout(0, 0));
         contentPanel.add(cardPanel, new GridConstraints(1, 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));
         controlsPanel = new JPanel();
-        controlsPanel.setLayout(new GridLayoutManager(1, 6, new Insets(0, 0, 0, 0), -1, -1));
+        controlsPanel.setLayout(new GridLayoutManager(1, 5, new Insets(0, 0, 0, 0), -1, -1));
         contentPanel.add(controlsPanel, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_NORTH, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false));
         egresosButton = new JToggleButton();
         egresosButton.setText("Egresos");
@@ -113,15 +108,11 @@ public class ManagerView {
         controlsPanel.add(datePicker, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
         final Spacer spacer1 = new Spacer();
         controlsPanel.add(spacer1, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
-        informesButton = new JToggleButton();
-        informesButton.setText("Informes");
-        controlsPanel.add(informesButton, new GridConstraints(0, 5, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(200, -1), null, 0, false));
         ButtonGroup buttonGroup;
         buttonGroup = new ButtonGroup();
         buttonGroup.add(egresosButton);
         buttonGroup.add(ingresosButton);
         buttonGroup.add(arqueoButton);
-        buttonGroup.add(informesButton);
     }
 
     /**
@@ -130,4 +121,5 @@ public class ManagerView {
     public JComponent $$$getRootComponent$$$() {
         return contentPanel;
     }
+
 }

src/danielcortes/xyz/views/InformesView.form

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="danielcortes.xyz.views.InformesView">
-  <grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
+    <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
       <xy x="20" y="20" width="419" height="356"/>
     </constraints>
@@ -9,12 +9,12 @@
     <border type="none"/>
     <children>
       <grid id="ae41b" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
+        <margin top="10" left="10" bottom="10" right="10"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
-        <border type="etched" title="Informes Generales"/>
+        <border type="etched" title="Informes Mensuales"/>
         <children>
           <component id="4644d" class="javax.swing.JButton" binding="generarLibroVentasButton" default-binding="true">
             <constraints>
@@ -39,11 +39,6 @@
           </vspacer>
         </children>
       </grid>
-      <hspacer id="c47e8">
-        <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-      </hspacer>
     </children>
   </grid>
 </form>

src/danielcortes/xyz/views/InformesView.java

@@ -65,11 +65,11 @@ public class InformesView {
      */
     private void $$$setupUI$$$() {
         contentPanel = new JPanel();
-        contentPanel.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1));
+        contentPanel.setLayout(new GridLayoutManager(1, 1, new Insets(10, 10, 10, 10), -1, -1));
         final JPanel panel1 = new JPanel();
-        panel1.setLayout(new GridLayoutManager(3, 1, new Insets(0, 0, 0, 0), -1, -1));
+        panel1.setLayout(new GridLayoutManager(3, 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 Generales"));
+        panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Informes Mensuales"));
         generarLibroVentasButton = new JButton();
         generarLibroVentasButton.setText("Libro de Ventas Mensual");
         panel1.add(generarLibroVentasButton, new GridConstraints(0, 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));
@@ -78,8 +78,6 @@ public class InformesView {
         panel1.add(GenerarEgresosFacturasMateriaPrimaButton, 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));
         final Spacer spacer1 = new Spacer();
         panel1.add(spacer1, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
-        final Spacer spacer2 = new Spacer();
-        contentPanel.add(spacer2, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
     }
 
     /**
@@ -88,4 +86,5 @@ public class InformesView {
     public JComponent $$$getRootComponent$$$() {
         return contentPanel;
     }
+
 }

src/danielcortes/xyz/views/MainView.form

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="danielcortes.xyz.views.MainView">
+  <grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="10" left="10" bottom="10" right="10"/>
+    <constraints>
+      <xy x="20" y="20" width="242" height="202"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="bc8d7" binding="buttonPanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="10" left="10" bottom="10" right="10"/>
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="etched"/>
+        <children>
+          <component id="23468" class="javax.swing.JButton" binding="cajasButton" default-binding="true">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Cajas"/>
+            </properties>
+          </component>
+          <component id="a7f47" class="javax.swing.JButton" binding="informesGeneralesButton">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Informes Generales"/>
+            </properties>
+          </component>
+          <vspacer id="bce90">
+            <constraints>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+            </constraints>
+          </vspacer>
+          <component id="23ee8" class="javax.swing.JButton" binding="informesMensualesButton">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Informes Mensuales"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>

src/danielcortes/xyz/views/MainView.java

@@ -0,0 +1,79 @@
+package danielcortes.xyz.views;
+
+import com.intellij.uiDesigner.core.GridConstraints;
+import com.intellij.uiDesigner.core.GridLayoutManager;
+import com.intellij.uiDesigner.core.Spacer;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class MainView {
+    private JPanel contentPanel;
+    private JButton informesMensualesButton;
+    private JButton cajasButton;
+    private JButton informesGeneralesButton;
+    private JPanel buttonPanel;
+
+    public JPanel getContentPanel() {
+        return contentPanel;
+    }
+
+    public JPanel getButtonPanel() {
+        return buttonPanel;
+    }
+
+    public JButton getInformesMensualesButton() {
+        return informesMensualesButton;
+    }
+
+    public JButton getCajasButton() {
+        return cajasButton;
+    }
+
+    public JButton getInformesGeneralesButton() {
+        return informesGeneralesButton;
+    }
+
+
+    {
+// GUI initializer generated by IntelliJ IDEA GUI Designer
+// >>> IMPORTANT!! <<<
+// DO NOT EDIT OR ADD ANY CODE HERE!
+        $$$setupUI$$$();
+    }
+
+    /**
+     * Method generated by IntelliJ IDEA GUI Designer
+     * >>> IMPORTANT!! <<<
+     * DO NOT edit this method OR call it in your code!
+     *
+     * @noinspection ALL
+     */
+    private void $$$setupUI$$$() {
+        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));
+        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();
+        cajasButton.setText("Cajas");
+        buttonPanel.add(cajasButton, new GridConstraints(0, 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));
+        informesGeneralesButton = new JButton();
+        informesGeneralesButton.setText("Informes Generales");
+        buttonPanel.add(informesGeneralesButton, 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));
+        final Spacer spacer1 = new Spacer();
+        buttonPanel.add(spacer1, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
+        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));
+    }
+
+    /**
+     * @noinspection ALL
+     */
+    public JComponent $$$getRootComponent$$$() {
+        return contentPanel;
+    }
+
+}