WebSVN - OpenConcerto - Diff - Rev 132 and 142 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/ConfigCaissePanel.java

 import java.awt.event.ItemListener;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
 import javax.swing.ComboBoxModel;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 public class ConfigCaissePanel extends JPanel {
+    private final POSConfiguration configuration = POSConfiguration.getInstance();
     private int userId;
     private int societeId;
     private int caisseId;
     private final ServerFinderPanel serverFinderPanel;
     private final JComboBox comboSociete;
     // Ticket printers
     private final TicketPrinterConfigPanel ticketPanel1;
     private final TicketPrinterConfigPanel ticketPanel2;
     // LCD
+    private JComboBox comboLCDType;
-    private JTextField textLCDSerialPort;
+    private JTextField textLCDPort;
     private JTextField textLCDLine1;
     private JTextField textLCDLine2;
     public ConfigCaissePanel(final ServerFinderPanel serverFinderPanel) {
         this.serverFinderPanel = serverFinderPanel;
         this.add(new JLabel("Fichier de configuration", SwingConstants.RIGHT), c);
         c.gridx++;
         c.gridwidth = 3;
         c.weightx = 1;
         JTextField textConfigurationFile = new JTextField("");
-        if (POSConfiguration.getConfigFile() != null) {
+        if (this.configuration.getConfigFile() != null) {
-            textConfigurationFile.setText(POSConfiguration.getConfigFile().getAbsolutePath());
+            textConfigurationFile.setText(this.configuration.getConfigFile().getAbsolutePath());
+        }
         textConfigurationFile.setEditable(false);
         this.add(textConfigurationFile, c);
         // Connexion
         c.gridy++;
         c.weightx = 0;
         c.gridwidth = 1;
         c.anchor = GridBagConstraints.EAST;
         c.fill = GridBagConstraints.NONE;
-        p.add(new JLabel("Port série", SwingConstants.RIGHT), c);
+        p.add(new JLabel("Type", SwingConstants.RIGHT), c);
+        c.gridx++;
+        c.weightx = 0;
+        c.fill = GridBagConstraints.NONE;
+        c.anchor = GridBagConstraints.WEST;
+        comboLCDType = new JComboBox(new String[] { "Port série", "Emulation imprimante" });
+        p.add(comboLCDType, c);
+        c.gridy++;
+        c.gridx = 0;
+        c.anchor = GridBagConstraints.EAST;
+        final JLabel labelType = new JLabel("Port", SwingConstants.RIGHT);
+        p.add(labelType, c);
         c.gridx++;
         c.weightx = 1;
         c.fill = GridBagConstraints.HORIZONTAL;
-        this.textLCDSerialPort = new JTextField(20);
+        this.textLCDPort = new JTextField(20);
-        p.add(this.textLCDSerialPort, c);
+        p.add(this.textLCDPort, c);
         c.weightx = 0;
         c.gridx++;
         final JButton selectPortButton = new JButton("Sélectionner");
         selectPortButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 List<String> choices = new ArrayList<String>();
                 final String title;
                 final String message;
+                if (comboLCDType.getSelectedIndex() == 1) {
+                    PrintService[] printServices = PrintServiceLookup.lookupPrintServices(null, null);
+                    for (PrintService printer : printServices) {
+                        choices.add(printer.getName());
+                    }
+                    title = "Afficheur LCD";
+                    message = "Choisissez l'imprimante correspondante à l'afficheur LCD";
+                } else if (comboLCDType.getSelectedIndex() == 0) {
-                choices.addAll(ESCSerialPrinter.getSerialPortNames());
+                    choices.addAll(ESCSerialPrinter.getSerialPortNames());
-                title = "Port série";
+                    title = "Port série";
-                message = "Choisissez le port série lié à l'afficheur";
+                    message = "Choisissez le port série lié à l'afficheur LCD";
+                } else {
+                    return;
+                }
                 if (choices.isEmpty()) {
                     return;
+                }
                 String s = (String) JOptionPane.showInputDialog(p, message, title, JOptionPane.PLAIN_MESSAGE, null, choices.toArray(), choices.get(0));
                 // If a string was returned
                 if ((s != null) && (s.length() > 0)) {
-                    textLCDSerialPort.setText(s);
+                    textLCDPort.setText(s);
+                }
+            }
         });
         p.add(selectPortButton, c);
-        //
         c.gridx = 0;
         c.gridy++;
         c.gridwidth = 3;
         p.add(new JLabel("Message d'accueil de l'afficheur"), c);
+        }
+    }
     public void loadConfiguration() {
-        final POSConfiguration configuration = POSConfiguration.getInstance();
+        final POSConfiguration configuration = this.configuration;
         // Terminal CB
         this.textTerminalCB.setText(configuration.getCreditCardPort());
         // Afficheur LCD
+        final String lcdType = configuration.getLCDType();
+        if (lcdType.equals("serial")) {
+            this.comboLCDType.setSelectedIndex(0);
+        } else {
+            this.comboLCDType.setSelectedIndex(1);
+        }
-        this.textLCDSerialPort.setText(configuration.getLCDSerialPort());
+        this.textLCDPort.setText(configuration.getLCDPort());
         this.textLCDLine1.setText(configuration.getLCDLine1());
         this.textLCDLine2.setText(configuration.getLCDLine2());
         this.userId = configuration.getUserID();
         this.societeId = configuration.getCompanyID();
         System.out.println("Caisse: id:" + this.caisseId);
         System.out.println("Utilisateur:  id:" + this.userId);
+    }
     public void saveConfiguration() {
-        POSConfiguration configuration = POSConfiguration.getInstance();
+        final POSConfiguration configuration = this.configuration;
         this.ticketPanel1.commitValues();
         this.ticketPanel2.commitValues();
         configuration.setUserID(this.userId);
         configuration.setCompanyID(this.societeId);
         configuration.setPosID(this.caisseId);
         configuration.setHeaderLines(this.headerTable.getLines());
         configuration.setFooterLines(this.footerTable.getLines());
         // Terminal CB
         configuration.setCreditCardPort(this.textTerminalCB.getText());
         // LCD
+        final int selectedIndex = this.comboLCDType.getSelectedIndex();
+        if (selectedIndex == 0) {
+            configuration.setLCDType("serial");
+        } else {
+            configuration.setLCDType("printer");
+        }
-        configuration.setLCDSerialPort(this.textLCDSerialPort.getText());
+        configuration.setLCDPort(this.textLCDPort.getText());
         configuration.setLCDLine1(this.textLCDLine1.getText());
         configuration.setLCDLine2(this.textLCDLine2.getText());
         // Save
         configuration.saveConfiguration();
+    }

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/ConfigCaissePanel.java @ 156 - Rev 132 → 142