Update of /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv8687
Modified Files:
MrPostmanGui.java messages.properties messages_de.properties
messages_es.properties messages_fr.properties
Log Message:
HTTPS Proxy support
Index: MrPostmanGui.java
===================================================================
RCS file: /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/gui/MrPostmanGui.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MrPostmanGui.java 11 May 2003 13:57:51 -0000 1.20
--- MrPostmanGui.java 29 May 2003 10:54:35 -0000 1.21
***************
*** 97,100 ****
--- 97,103 ----
private javax.swing.JTextField proxyAddr;
private javax.swing.JTextField proxyPort;
+ private javax.swing.JCheckBox useHttpsProxy;
+ private javax.swing.JTextField httpsProxyAddr;
+ private javax.swing.JTextField httpsProxyPort;
private javax.swing.JMenu jMenu1;
***************
*** 200,203 ****
--- 203,209 ----
proxyAddr = new javax.swing.JTextField(20);
proxyPort = new javax.swing.JTextField(20);
+ useHttpsProxy = new javax.swing.JCheckBox();
+ httpsProxyAddr = new javax.swing.JTextField(16);
+ httpsProxyPort = new javax.swing.JTextField(16);
setTitle(MessageUtil.getMessage("application.title"));
***************
*** 375,379 ****
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
proxyPanel.add(proxyPort, gridBagConstraints);
!
jTabbedPane1.addTab(MessageUtil.getMessage("tab.proxy.title"), proxyPanel);
--- 381,433 ----
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
proxyPanel.add(proxyPort, gridBagConstraints);
!
! useHttpsProxy.setSelected((MrPostman.getMainInstance()).userprefs.getBoolean("UseHttpsProxy", false));
! useHttpsProxy.setText(MessageUtil.getMessage("proxy.usehttpsproxy"));
! gridBagConstraints = new java.awt.GridBagConstraints();
! gridBagConstraints.gridx = 0;
! gridBagConstraints.gridy = 3;
! gridBagConstraints.gridwidth = 2;
! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
! proxyPanel.add(useHttpsProxy, gridBagConstraints);
! useHttpsProxy.addItemListener(new java.awt.event.ItemListener() {
! public void itemStateChanged(java.awt.event.ItemEvent evt) {
! useHttpsProxyActionPerformed(evt);
! }
! });
!
! gridBagConstraints = new java.awt.GridBagConstraints();
! gridBagConstraints.gridx = 0;
! gridBagConstraints.gridy = 4;
! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
! tmplabel = new javax.swing.JLabel();
! tmplabel.setText(MessageUtil.getMessage("proxy.addr"));
! tmplabel.setToolTipText("");
! proxyPanel.add(tmplabel, gridBagConstraints);
!
! httpsProxyAddr.setText(MrPostman.getMainInstance().userprefs.get("httpsProxyAddr", "127.0.0.1"));
! gridBagConstraints = new java.awt.GridBagConstraints();
! gridBagConstraints.gridx = 1;
! gridBagConstraints.gridy = 4;
! gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
! proxyPanel.add(httpsProxyAddr, gridBagConstraints);
!
! gridBagConstraints = new java.awt.GridBagConstraints();
! gridBagConstraints.gridx = 0;
! gridBagConstraints.gridy = 5;
! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
! tmplabel = new javax.swing.JLabel();
! tmplabel.setText(MessageUtil.getMessage("proxy.port"));
! tmplabel.setToolTipText("");
! proxyPanel.add(tmplabel, gridBagConstraints);
!
! httpsProxyPort.setText(new Integer(MrPostman.getMainInstance().userprefs.getInt("httpsProxyPort", 8081)).toString());
! gridBagConstraints = new java.awt.GridBagConstraints();
! gridBagConstraints.gridx = 1;
! gridBagConstraints.gridy = 5;
! gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
! gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
! proxyPanel.add(httpsProxyPort, gridBagConstraints);
!
jTabbedPane1.addTab(MessageUtil.getMessage("tab.proxy.title"), proxyPanel);
***************
*** 582,585 ****
--- 636,644 ----
MrPostman.getMainInstance().userprefs.put("proxyAddr", proxyAddr.getText());
MrPostman.getMainInstance().userprefs.put("proxyPort", proxyPort.getText());
+
+ MrPostman.getMainInstance().userprefs.putBoolean("useHttpsProxy", useHttpsProxy.isSelected());
+ MrPostman.getMainInstance().userprefs.put("httpsProxyAddr", httpsProxyAddr.getText());
+ MrPostman.getMainInstance().userprefs.put("httpsProxyPort", httpsProxyPort.getText());
+
mpn.exit();
}
***************
*** 611,614 ****
--- 670,688 ----
}
}
+
+ private void useHttpsProxyActionPerformed(java.awt.event.ItemEvent evt) {
+ MrPostman.getMainInstance().userprefs.putBoolean("useHttpsProxy", useHttpsProxy.isSelected());
+ MrPostman.getMainInstance().userprefs.put("httpsProxyAddr", httpsProxyAddr.getText());
+ MrPostman.getMainInstance().userprefs.put("httpsProxyPort", httpsProxyPort.getText());
+ Properties systemProperties = System.getProperties();
+ if (evt.getStateChange() == evt.SELECTED) {
+ systemProperties.setProperty("https.proxyHost", httpsProxyAddr.getText());
+ systemProperties.setProperty("https.proxyPort", httpsProxyPort.getText());
+ } else {
+ systemProperties.remove("https.proxyHost");
+ systemProperties.remove("https.proxyPort");
+ }
+ }
+
//GEN-LAST:event_logButtonActionPerformed
private void CloseGuiMenuItemActionPerformed(java.awt.event.ActionEvent evt) { //GEN-FIRST:event_CloseGuiMenuItemActionPerformed
***************
*** 659,662 ****
--- 733,741 ----
MrPostman.getMainInstance().userprefs.put("proxyAddr", proxyAddr.getText());
MrPostman.getMainInstance().userprefs.put("proxyPort", proxyPort.getText());
+
+ MrPostman.getMainInstance().userprefs.putBoolean("useHttpsProxy", useHttpsProxy.isSelected());
+ MrPostman.getMainInstance().userprefs.put("httpsProxyAddr", httpsProxyAddr.getText());
+ MrPostman.getMainInstance().userprefs.put("httpsProxyPort", httpsProxyPort.getText());
+
mpn.exit();
}
Index: messages.properties
===================================================================
RCS file: /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/gui/messages.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** messages.properties 8 May 2003 07:57:37 -0000 1.8
--- messages.properties 29 May 2003 10:54:36 -0000 1.9
***************
*** 1,64 ****
! # The GUI messages for Mr Postman
! # Please do not hard code user visible strings in the java code!
!
! application.title=MrPostman
! application.help.title=MrPostman Help
!
! option.otherhosts=Allow other hosts to use MrPostman
! option.gui-startup=Run the GUI when program starts
! option.log-startup=Open Log window when program starts
! labels.serverport=Server Port :
! button.showlog=Show Log
! message.serverport.restartrequired=You must Restart MrPostman for this to take effect.
!
! proxy.useproxy=use Proxy Configuration:
! proxy.addr=address:
! proxy.port=port:
! proxy.user=user:
! proxy.password=password:
!
! tab.main.title=Main
! tab.modules.title=Modules
! tab.proxy.title=Proxy
!
! menu.file.title=File
! menu.file.item.close=Close GUI
! menu.file.item.exit=Exit
!
! menu.help.title=Help
! menu.help.item.using=Using MrPostman
! menu.help.item.about=About
!
! about.title=About
! about.info=@APPNAME@ @VERSION@\nBuild @DSTAMP@\n(C) 2003 The MrPostman Development Team\n\nHector Urtubia\nChris Humphreys\nLucas Bruand\nThomas O'Dowd\n\nLicensed under the terms of the GNU Public License\nVisit http://mrbook.org/mrpostman for updates\nand see how you can contribute
!
! using.title=Using MrPostman
! using.info=Please refer to the README file packaged on the executable JAR.\nFor more information, visit http://mrbook.org/mrpostman
!
! button.help.home=Help Home
! button.help.back=Back
!
! #module info panel messages...
!
! modules.info.version.label=Version :
! modules.info.authors.label=Author(s) :
! modules.info.options.label=Options :
! button.apply.label=Apply
! button.help.label=Help
!
! #Module option messages...
!
! modules.hotmail.option.unread.label=Unread Only
! modules.hotmail.option.unread.desc=Collect only Unread mail
! modules.hotmail.option.markread.label=Mark read
! modules.hotmail.option.markread.desc=Flag the collected messages as read
!
! modules.another.option.markread.label=Mark read
! modules.another.option.markread.desc=Flag the collected messages as read
! modules.another.option.debugpagehtml.label=Debug HTML
! modules.another.option.debugpagehtml.desc=Developer option - when selected logs web page html to log file
! modules.another.option.summary.label=Log Summary
! modules.another.option.summary.desc=Developer option - Writes a summary of mail collection to log file
!
! modules.yahoo.option.https.label=Use HTTPS
! modules.yahoo.option.https.desc=Use HTTPS rather than HTTP for signon
--- 1,65 ----
! # The GUI messages for Mr Postman
! # Please do not hard code user visible strings in the java code!
!
! application.title=MrPostman
! application.help.title=MrPostman Help
!
! option.otherhosts=Allow other hosts to use MrPostman
! option.gui-startup=Run the GUI when program starts
! option.log-startup=Open Log window when program starts
! labels.serverport=Server Port :
! button.showlog=Show Log
! message.serverport.restartrequired=You must Restart MrPostman for this to take effect.
!
! proxy.useproxy=use Proxy Configuration:
! proxy.usehttpsproxy=use HTTPS Proxy Configuration:
! proxy.addr=address:
! proxy.port=port:
! proxy.user=user:
! proxy.password=password:
!
! tab.main.title=Main
! tab.modules.title=Modules
! tab.proxy.title=Proxy
!
! menu.file.title=File
! menu.file.item.close=Close GUI
! menu.file.item.exit=Exit
!
! menu.help.title=Help
! menu.help.item.using=Using MrPostman
! menu.help.item.about=About
!
! about.title=About
! about.info=@APPNAME@ @VERSION@\nBuild @DSTAMP@\n(C) 2003 The MrPostman Development Team\n\nHector Urtubia\nChris Humphreys\nLucas Bruand\nThomas O'Dowd\n\nLicensed under the terms of the GNU Public License\nVisit http://mrbook.org/mrpostman for updates\nand see how you can contribute
!
! using.title=Using MrPostman
! using.info=Please refer to the README file packaged on the executable JAR.\nFor more information, visit http://mrbook.org/mrpostman
!
! button.help.home=Help Home
! button.help.back=Back
!
! #module info panel messages...
!
! modules.info.version.label=Version :
! modules.info.authors.label=Author(s) :
! modules.info.options.label=Options :
! button.apply.label=Apply
! button.help.label=Help
!
! #Module option messages...
!
! modules.hotmail.option.unread.label=Unread Only
! modules.hotmail.option.unread.desc=Collect only Unread mail
! modules.hotmail.option.markread.label=Mark read
! modules.hotmail.option.markread.desc=Flag the collected messages as read
!
! modules.another.option.markread.label=Mark read
! modules.another.option.markread.desc=Flag the collected messages as read
! modules.another.option.debugpagehtml.label=Debug HTML
! modules.another.option.debugpagehtml.desc=Developer option - when selected logs web page html to log file
! modules.another.option.summary.label=Log Summary
! modules.another.option.summary.desc=Developer option - Writes a summary of mail collection to log file
!
! modules.yahoo.option.https.label=Use HTTPS
! modules.yahoo.option.https.desc=Use HTTPS rather than HTTP for signon
Index: messages_de.properties
===================================================================
RCS file: /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/gui/messages_de.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** messages_de.properties 9 May 2003 19:31:56 -0000 1.1
--- messages_de.properties 29 May 2003 10:54:36 -0000 1.2
***************
*** 26,30 ****
proxy.useproxy=Proxy verwenden:
!
proxy.addr=Adresse:
--- 26,30 ----
proxy.useproxy=Proxy verwenden:
! proxy.usehttpsproxy=HTTPS Proxy verwenden:
proxy.addr=Adresse:
Index: messages_es.properties
===================================================================
RCS file: /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/gui/messages_es.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** messages_es.properties 8 May 2003 07:57:37 -0000 1.7
--- messages_es.properties 29 May 2003 10:54:36 -0000 1.8
***************
*** 1,65 ****
! # The GUI messages for Mr Postman
! # Please do not hard code user visible strings in the java code!
!
! application.title=MrPostman
! application.help.title=MrPostman Help
!
! option.otherhosts=Autorizar a otros para usar esta instancia de Mrpostman
! option.gui-startup=Mostrar la interfaz grafica al correr el programa
! option.log-startup=Abrir la ventana de mensajes al correr el programa
! labels.serverport=Puerto del Servidor:
! message.serverport.restartrequired=You must Restart MrPostman for this to take effect.
!
! button.showlog=Mostrar mensajes
!
! proxy.useproxy=use Proxy Configuration:
! proxy.addr=address:
! proxy.port=port:
! proxy.user=user:
! proxy.password=password:
!
! tab.main.title=Principal
! tab.modules.title=Modulos
! tab.proxy.title=Proxy
!
! menu.file.title=Archivo
! menu.file.item.close=Cerrar la ventana
! menu.file.item.exit=Salir
!
! menu.help.title=Ayuda
! menu.help.item.using=Usando MrPostman
! menu.help.item.about=Acerca del programa
!
! about.title=Acerca
! about.info=@APPNAME@ @VERSION@\nBuild @DSTAMP@\n(C) 2003 The MrPostman Development Team\nHector Urtubia\nChris Humphreys\nLucas Bruand\nThomas O'Dowd\nLicensiado bajo los terminos de la licensia GPL.\nVisite http://mrbook.org/mrpostman para actualizaciones\ny vea como ud. puede contribuir con el proyecto.
!
! using.title=Usando MrPostman
! using.info=Por favor vea el archivo README que viene empaquetado en el JAR ejecutable. Para mas informacion, visite http://mrbook.org/mrpostman
!
! button.help.home=Help Home
! button.help.back=Back
!
! #module info panel messages...
!
! modules.info.version.label=Version :
! modules.info.authors.label=Autor(es) :
! modules.info.options.label=Opciones :
! button.apply.label=Aplicar
! button.help.label=Help
!
! #Module option messages...
!
! modules.hotmail.option.unread.label=Unread Only
! modules.hotmail.option.unread.desc=Collect only Unread mail
! modules.hotmail.option.markread.label=Mark read
! modules.hotmail.option.markread.desc=Flag the collected messages as read
!
! modules.another.option.markread.label=Mark read
! modules.another.option.markread.desc=Flag the collected messages as read
! modules.another.option.debugpagehtml.label=Debug HTML
! modules.another.option.debugpagehtml.desc=Developer option - when selected logs web page html to log file
! modules.another.option.summary.label=Log Summary
! modules.another.option.summary.desc=Developer option - Writes a summary of mail collection to log file
!
! modules.yahoo.option.https.label=Use HTTPS
! modules.yahoo.option.https.desc=Use HTTPS rather than HTTP for signon
--- 1,66 ----
! # The GUI messages for Mr Postman
! # Please do not hard code user visible strings in the java code!
!
! application.title=MrPostman
! application.help.title=MrPostman Help
!
! option.otherhosts=Autorizar a otros para usar esta instancia de Mrpostman
! option.gui-startup=Mostrar la interfaz grafica al correr el programa
! option.log-startup=Abrir la ventana de mensajes al correr el programa
! labels.serverport=Puerto del Servidor:
! message.serverport.restartrequired=You must Restart MrPostman for this to take effect.
!
! button.showlog=Mostrar mensajes
!
! proxy.useproxy=use Proxy Configuration:
! proxy.usehttpsproxy=use HTTPS Proxy Configuration:
! proxy.addr=address:
! proxy.port=port:
! proxy.user=user:
! proxy.password=password:
!
! tab.main.title=Principal
! tab.modules.title=Modulos
! tab.proxy.title=Proxy
!
! menu.file.title=Archivo
! menu.file.item.close=Cerrar la ventana
! menu.file.item.exit=Salir
!
! menu.help.title=Ayuda
! menu.help.item.using=Usando MrPostman
! menu.help.item.about=Acerca del programa
!
! about.title=Acerca
! about.info=@APPNAME@ @VERSION@\nBuild @DSTAMP@\n(C) 2003 The MrPostman Development Team\nHector Urtubia\nChris Humphreys\nLucas Bruand\nThomas O'Dowd\nLicensiado bajo los terminos de la licensia GPL.\nVisite http://mrbook.org/mrpostman para actualizaciones\ny vea como ud. puede contribuir con el proyecto.
!
! using.title=Usando MrPostman
! using.info=Por favor vea el archivo README que viene empaquetado en el JAR ejecutable. Para mas informacion, visite http://mrbook.org/mrpostman
!
! button.help.home=Help Home
! button.help.back=Back
!
! #module info panel messages...
!
! modules.info.version.label=Version :
! modules.info.authors.label=Autor(es) :
! modules.info.options.label=Opciones :
! button.apply.label=Aplicar
! button.help.label=Help
!
! #Module option messages...
!
! modules.hotmail.option.unread.label=Unread Only
! modules.hotmail.option.unread.desc=Collect only Unread mail
! modules.hotmail.option.markread.label=Mark read
! modules.hotmail.option.markread.desc=Flag the collected messages as read
!
! modules.another.option.markread.label=Mark read
! modules.another.option.markread.desc=Flag the collected messages as read
! modules.another.option.debugpagehtml.label=Debug HTML
! modules.another.option.debugpagehtml.desc=Developer option - when selected logs web page html to log file
! modules.another.option.summary.label=Log Summary
! modules.another.option.summary.desc=Developer option - Writes a summary of mail collection to log file
!
! modules.yahoo.option.https.label=Use HTTPS
! modules.yahoo.option.https.desc=Use HTTPS rather than HTTP for signon
Index: messages_fr.properties
===================================================================
RCS file: /cvsroot/mrpostman/mrpostman/src/org/mrbook/mrpostman/gui/messages_fr.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** messages_fr.properties 8 May 2003 08:39:26 -0000 1.13
--- messages_fr.properties 29 May 2003 10:54:36 -0000 1.14
***************
*** 32,35 ****
--- 32,36 ----
proxy.useproxy=utiliser la configuration proxy:
+ proxy.usehttpsproxy=utiliser la configuration proxy HTTPS:
proxy.addr=adresse:
|
