moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-01-13 22:48:07 -05:00
Code Issues Releases Wiki Activity

Prepare new advanced options

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@916 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-01-19 23:50:30 +00:00
parent 8911534afb
commit c1ffd164aa
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/java/davmail/ui/SettingsFrame.java
View File

@ -333,6 +333,7 @@ public class SettingsFrame extends JFrame {
BundleMessage.format("UI_SERVER_CERTIFICATE_HASH_HELP"));
addSettingComponent(networkSettingsPanel, BundleMessage.format("UI_DISABLE_UPDATE_CHECK"), disableUpdateCheck,
BundleMessage.format("UI_DISABLE_UPDATE_CHECK_HELP"));
networkSettingsPanel.setMaximumSize(networkSettingsPanel.getPreferredSize());
return networkSettingsPanel;
}
@ -367,6 +368,8 @@ public class SettingsFrame extends JFrame {
loggingPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_LOGGING_LEVELS")));
loggingPanel.add(logFilePathPanel);
loggingPanel.add(loggingLevelPanel);
loggingPanel.setMaximumSize(loggingPanel.getPreferredSize());
return loggingPanel;
}
@ -447,9 +450,6 @@ public class SettingsFrame extends JFrame {
tabbedPane.add(BundleMessage.format("UI_TAB_MAIN"), mainPanel);
JPanel advancedPanel = new JPanel();
advancedPanel.setLayout(new BoxLayout(advancedPanel, BoxLayout.Y_AXIS));
JPanel proxyPanel = new JPanel();
proxyPanel.setLayout(new BoxLayout(proxyPanel, BoxLayout.Y_AXIS));
proxyPanel.add(getProxyPanel());
@ -464,8 +464,20 @@ public class SettingsFrame extends JFrame {
encryptionPanel.add(getSmartCardPanel());
tabbedPane.add(BundleMessage.format("UI_TAB_ENCRYPTION"), encryptionPanel);
JPanel loggingPanel = new JPanel();
loggingPanel.setLayout(new BoxLayout(loggingPanel, BoxLayout.Y_AXIS));
loggingPanel.add(getLoggingSettingsPanel());
// empty panel
loggingPanel.add(new JPanel());
tabbedPane.add(BundleMessage.format("UI_TAB_LOGGING"), loggingPanel);
JPanel advancedPanel = new JPanel();
advancedPanel.setLayout(new BoxLayout(advancedPanel, BoxLayout.Y_AXIS));
advancedPanel.add(getNetworkSettingsPanel());
advancedPanel.add(getLoggingSettingsPanel());
// empty panel
advancedPanel.add(new JPanel());
tabbedPane.add(BundleMessage.format("UI_TAB_ADVANCED"), advancedPanel);

1
src/java/davmailmessages.properties
View File

@ -238,3 +238,4 @@ LOG_FOLDER_NOT_FOUND=Folder {0} not found
LOG_FOLDER_ACCESS_FORBIDDEN=Folder access to {0} forbidden
LOG_FOLDER_ACCESS_ERROR=Folder access to {0} error: {1}
UI_OTP_PASSWORD_PROMPT=One Time (token) Password:
UI_TAB_LOGGING=Logging

3
src/java/davmailmessages_fr.properties
View File

@ -237,4 +237,5 @@ UI_CLIENT_KEY_STORE_TYPE_HELP=Choisir le type de stockage du certificat client,
UI_CLIENT_KEY_STORE=Fichier certificat client :
UI_CLIENT_KEY_STORE_HELP=Chemin du fichier contenant le certificat client SSL
UI_CLIENT_KEY_STORE_PASSWORD=Mot de passe certificat client :
UI_CLIENT_KEY_STORE_PASSWORD_HELP=Mot de passe du certificat client, laisser vide pour fournir le mot de passe mode interactif
UI_CLIENT_KEY_STORE_PASSWORD_HELP=Mot de passe du certificat client, laisser vide pour fournir le mot de passe mode interactif
UI_TAB_LOGGING=Traces