diff --git a/src/main/java/com/unicenta/pos/forms/JPrincipalApp.form b/src/main/java/com/unicenta/pos/forms/JPrincipalApp.form index 6170ec8..bf7a551 100644 --- a/src/main/java/com/unicenta/pos/forms/JPrincipalApp.form +++ b/src/main/java/com/unicenta/pos/forms/JPrincipalApp.form @@ -21,7 +21,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -81,15 +81,15 @@ - - - + + + - + @@ -112,14 +112,14 @@ - + - + @@ -133,7 +133,7 @@ - + @@ -142,7 +142,7 @@ - + diff --git a/src/main/java/com/unicenta/pos/forms/JPrincipalApp.java b/src/main/java/com/unicenta/pos/forms/JPrincipalApp.java index 37495ef..e3b9a6d 100644 --- a/src/main/java/com/unicenta/pos/forms/JPrincipalApp.java +++ b/src/main/java/com/unicenta/pos/forms/JPrincipalApp.java @@ -101,20 +101,16 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView { m_principalnotificator.setText(m_appuser.getName()); m_principalnotificator.setIcon(m_appuser.getIcon()); - if (jButton1.getComponentOrientation().isLeftToRight()) { - menu_open = new javax.swing.ImageIcon(getClass().getResource( - "/com/unicenta/images/menu-right.png")); - menu_close = new javax.swing.ImageIcon(getClass().getResource( - "/com/unicenta/images/menu-left.png")); + if (showMainMenuButton.getComponentOrientation().isLeftToRight()) { + menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png")); + menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png")); } else { - menu_open = new javax.swing.ImageIcon(getClass().getResource( - "/com/unicenta/images/menu-left.png")); - menu_close = new javax.swing.ImageIcon(getClass().getResource( - "/com/unicenta/images/menu-right.png")); + menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png")); + menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png")); } assignMenuButtonIcon(); - m_jPanelTitle.setVisible(false); + salesScreenTitlePanel.setVisible(false); m_jPanelContainer.add(new JPanel(), ""); showView(""); @@ -146,9 +142,7 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView { } private void assignMenuButtonIcon() { - jButton1.setIcon(m_jPanelLeft.isVisible() - ? menu_close - : menu_open); + showMainMenuButton.setIcon(m_jPanelLeft.isVisible() ? menu_close : menu_open); } /** @@ -490,12 +484,13 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView { m_jLastView = m_jMyView; setMenuVisible(getBounds().width > 800); + setMenuVisible(getBounds().height > 600); setMenuVisible(false); showView(sTaskClass); String sTitle = m_jMyView.getTitle(); - m_jPanelTitle.setVisible(sTitle != null); - m_jTitle.setText(sTitle); + salesScreenTitlePanel.setVisible(sTitle != null); + salesScreenTitleLabel.setText(sTitle); } } else { @@ -545,106 +540,106 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView { * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents - private void initComponents() { + // //GEN-BEGIN:initComponents + private void initComponents() { - jPanel1 = new javax.swing.JPanel(); - m_jPanelLeft = new javax.swing.JScrollPane(); - jPanel2 = new javax.swing.JPanel(); - jButton1 = new javax.swing.JButton(); - m_jPanelRight = new javax.swing.JPanel(); - m_jPanelTitle = new javax.swing.JPanel(); - m_jTitle = new javax.swing.JLabel(); - m_jPanelContainer = new javax.swing.JPanel(); + mainMenuJPanel = new javax.swing.JPanel(); + m_jPanelLeft = new javax.swing.JScrollPane(); + jPanel2 = new javax.swing.JPanel(); + showMainMenuButton = new javax.swing.JButton(); + salesScreenJPanel = new javax.swing.JPanel(); + salesScreenTitlePanel = new javax.swing.JPanel(); + salesScreenTitleLabel = new javax.swing.JLabel(); + m_jPanelContainer = new javax.swing.JPanel(); - setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N - setLayout(new java.awt.BorderLayout()); + setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N + setLayout(new java.awt.BorderLayout()); - jPanel1.setLayout(new java.awt.BorderLayout()); + mainMenuJPanel.setLayout(new java.awt.BorderLayout()); - m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102)); - m_jPanelLeft.setBorder(null); - m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N - m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2)); - jPanel1.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START); + m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102)); + m_jPanelLeft.setBorder(null); + m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N + m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2)); + mainMenuJPanel.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START); - jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N - jPanel2.setPreferredSize(new java.awt.Dimension(45, 45)); + jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N + jPanel2.setPreferredSize(new java.awt.Dimension(45, 45)); - jButton1.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N - jButton1.setFocusPainted(false); - jButton1.setFocusable(false); - jButton1.setIconTextGap(0); - jButton1.setMargin(new java.awt.Insets(10, 2, 10, 2)); - jButton1.setMaximumSize(new java.awt.Dimension(45, 32224661)); - jButton1.setMinimumSize(new java.awt.Dimension(32, 32)); - jButton1.setPreferredSize(new java.awt.Dimension(36, 45)); - jButton1.setRequestFocusEnabled(false); - jButton1.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jButton1ActionPerformed(evt); - } - }); + showMainMenuButton.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N + showMainMenuButton.setFocusPainted(false); + showMainMenuButton.setFocusable(false); + showMainMenuButton.setIconTextGap(0); + showMainMenuButton.setMargin(new java.awt.Insets(10, 2, 10, 2)); + showMainMenuButton.setMaximumSize(new java.awt.Dimension(45, 32224661)); + showMainMenuButton.setMinimumSize(new java.awt.Dimension(32, 32)); + showMainMenuButton.setPreferredSize(new java.awt.Dimension(36, 45)); + showMainMenuButton.setRequestFocusEnabled(false); + showMainMenuButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + showMainMenuButtonActionPerformed(evt); + } + }); - javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); - jPanel2.setLayout(jPanel2Layout); - jPanel2Layout.setHorizontalGroup( + javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2); + jPanel2.setLayout(jPanel2Layout); + jPanel2Layout.setHorizontalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() - .addGap(0, 0, 0) - .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap()) - ); - jPanel2Layout.setVerticalGroup( + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() + .addGap(0, 0, 0) + .addComponent(showMainMenuButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap()) + ); + jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() - .addContainerGap(88, Short.MAX_VALUE) - .addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, 33, Short.MAX_VALUE) - .addContainerGap(188, Short.MAX_VALUE)) - ); + .addGroup(jPanel2Layout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(showMainMenuButton, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE) + .addContainerGap(95, Short.MAX_VALUE)) + ); - jPanel1.add(jPanel2, java.awt.BorderLayout.LINE_END); + mainMenuJPanel.add(jPanel2, java.awt.BorderLayout.LINE_END); - add(jPanel1, java.awt.BorderLayout.LINE_START); + add(mainMenuJPanel, java.awt.BorderLayout.LINE_START); - m_jPanelRight.setPreferredSize(new java.awt.Dimension(200, 40)); - m_jPanelRight.setLayout(new java.awt.BorderLayout()); + salesScreenJPanel.setPreferredSize(new java.awt.Dimension(200, 40)); + salesScreenJPanel.setLayout(new java.awt.BorderLayout()); - m_jPanelTitle.setLayout(new java.awt.BorderLayout()); + salesScreenTitlePanel.setLayout(new java.awt.BorderLayout()); - m_jTitle.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N - m_jTitle.setForeground(new java.awt.Color(0, 168, 223)); - m_jTitle.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, java.awt.Color.darkGray), javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10))); - m_jTitle.setMaximumSize(new java.awt.Dimension(100, 35)); - m_jTitle.setMinimumSize(new java.awt.Dimension(30, 25)); - m_jTitle.setPreferredSize(new java.awt.Dimension(100, 35)); - m_jPanelTitle.add(m_jTitle, java.awt.BorderLayout.NORTH); + salesScreenTitleLabel.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N + salesScreenTitleLabel.setForeground(new java.awt.Color(0, 168, 223)); + salesScreenTitleLabel.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, java.awt.Color.darkGray), javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10))); + salesScreenTitleLabel.setMaximumSize(new java.awt.Dimension(100, 35)); + salesScreenTitleLabel.setMinimumSize(new java.awt.Dimension(30, 25)); + salesScreenTitleLabel.setPreferredSize(new java.awt.Dimension(100, 35)); + salesScreenTitlePanel.add(salesScreenTitleLabel, java.awt.BorderLayout.NORTH); - m_jPanelRight.add(m_jPanelTitle, java.awt.BorderLayout.NORTH); + salesScreenJPanel.add(salesScreenTitlePanel, java.awt.BorderLayout.NORTH); - m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N - m_jPanelContainer.setLayout(new java.awt.CardLayout()); - m_jPanelRight.add(m_jPanelContainer, java.awt.BorderLayout.CENTER); + m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N + m_jPanelContainer.setLayout(new java.awt.CardLayout()); + salesScreenJPanel.add(m_jPanelContainer, BorderLayout.CENTER); - add(m_jPanelRight, java.awt.BorderLayout.CENTER); - }// //GEN-END:initComponents + add(salesScreenJPanel, java.awt.BorderLayout.CENTER); + }// //GEN-END:initComponents - private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed + private void showMainMenuButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showMainMenuButtonActionPerformed setMenuVisible(!m_jPanelLeft.isVisible()); - }//GEN-LAST:event_jButton1ActionPerformed + }//GEN-LAST:event_showMainMenuButtonActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton jButton1; - private javax.swing.JPanel jPanel1; - private javax.swing.JPanel jPanel2; - private javax.swing.JPanel m_jPanelContainer; - private javax.swing.JScrollPane m_jPanelLeft; - private javax.swing.JPanel m_jPanelRight; - private javax.swing.JPanel m_jPanelTitle; - private javax.swing.JLabel m_jTitle; - // End of variables declaration//GEN-END:variables + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JPanel jPanel2; + private javax.swing.JPanel m_jPanelContainer; + private javax.swing.JScrollPane m_jPanelLeft; + private javax.swing.JPanel mainMenuJPanel; + private javax.swing.JPanel salesScreenJPanel; + private javax.swing.JLabel salesScreenTitleLabel; + private javax.swing.JPanel salesScreenTitlePanel; + private javax.swing.JButton showMainMenuButton; + // End of variables declaration//GEN-END:variables } \ No newline at end of file