mirror of
https://github.com/moparisthebest/davmail
synced 2025-01-07 03:38:05 -05:00
Caldav: let users edit outgoing notifications for meeting requests
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1890 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
parent
5956574072
commit
0c4454a9fc
@ -63,7 +63,7 @@ public class NotificationDialog extends JDialog {
|
|||||||
* @param cc copy recipients
|
* @param cc copy recipients
|
||||||
* @param subject notification subject
|
* @param subject notification subject
|
||||||
*/
|
*/
|
||||||
public NotificationDialog(String to, String cc, String subject) {
|
public NotificationDialog(String to, String cc, String subject, String description) {
|
||||||
setModal(true);
|
setModal(true);
|
||||||
setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
|
setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
|
||||||
setTitle(BundleMessage.format("UI_CALDAV_NOTIFICATION"));
|
setTitle(BundleMessage.format("UI_CALDAV_NOTIFICATION"));
|
||||||
@ -85,7 +85,7 @@ public class NotificationDialog extends JDialog {
|
|||||||
|
|
||||||
mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
|
mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
|
||||||
mainPanel.add(getRecipientsPanel());
|
mainPanel.add(getRecipientsPanel());
|
||||||
mainPanel.add(getBodyPanel());
|
mainPanel.add(getBodyPanel(description));
|
||||||
|
|
||||||
JPanel recipientsPanel = getRecipientsPanel();
|
JPanel recipientsPanel = getRecipientsPanel();
|
||||||
if (to != null) {
|
if (to != null) {
|
||||||
@ -98,7 +98,7 @@ public class NotificationDialog extends JDialog {
|
|||||||
subjectField.setText(subject);
|
subjectField.setText(subject);
|
||||||
}
|
}
|
||||||
add(BorderLayout.NORTH, recipientsPanel);
|
add(BorderLayout.NORTH, recipientsPanel);
|
||||||
JPanel bodyPanel = getBodyPanel();
|
JPanel bodyPanel = getBodyPanel(description);
|
||||||
add(BorderLayout.CENTER, bodyPanel);
|
add(BorderLayout.CENTER, bodyPanel);
|
||||||
bodyField.setPreferredSize(recipientsPanel.getPreferredSize());
|
bodyField.setPreferredSize(recipientsPanel.getPreferredSize());
|
||||||
|
|
||||||
@ -156,11 +156,12 @@ public class NotificationDialog extends JDialog {
|
|||||||
return recipientsPanel;
|
return recipientsPanel;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected JPanel getBodyPanel() {
|
protected JPanel getBodyPanel(String description) {
|
||||||
JPanel bodyPanel = new JPanel();
|
JPanel bodyPanel = new JPanel();
|
||||||
bodyPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_NOTIFICATION_BODY")));
|
bodyPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_NOTIFICATION_BODY")));
|
||||||
|
|
||||||
bodyField = new JEditorPane();
|
bodyField = new JEditorPane();
|
||||||
|
bodyField.setText(description);
|
||||||
//HTMLEditorKit htmlEditorKit = new HTMLEditorKit();
|
//HTMLEditorKit htmlEditorKit = new HTMLEditorKit();
|
||||||
//bodyField.setEditorKit(htmlEditorKit);
|
//bodyField.setEditorKit(htmlEditorKit);
|
||||||
//bodyField.setContentType("text/html");
|
//bodyField.setContentType("text/html");
|
||||||
|
Loading…
Reference in New Issue
Block a user