Author: bback
Date: 2006-03-11 12:35:26 +0000 (Sat, 11 Mar 2006)
New Revision: 8226
Modified:
trunk/apps/frost-0.7/source/frost/gui/MessageFrame.java
Log:
fixes in messageframe
Modified: trunk/apps/frost-0.7/source/frost/gui/MessageFrame.java
===================================================================
--- trunk/apps/frost-0.7/source/frost/gui/MessageFrame.java 2006-03-11
11:16:22 UTC (rev 8225)
+++ trunk/apps/frost-0.7/source/frost/gui/MessageFrame.java 2006-03-11
12:35:26 UTC (rev 8226)
@@ -817,12 +817,12 @@
headerArea.setEnabled(false);
board = newBoard;
- from = newFrom;
+ from = newFrom;
subject = newSubject;
String text = newText;
-
- String date = DateFun.getExtendedDate() + " - " +
DateFun.getFullExtendedTime() + "GMT";
+ String date = DateFun.getExtendedDate() + " - " +
DateFun.getFullExtendedTime() + "GMT";
+
if (isReply) {
text += "\n\n";
}
@@ -852,16 +852,21 @@
} catch (Exception e) {
logger.log(Level.SEVERE, "Exception thrown in
composeMessage(...)", e);
}
-
+
// maybe prepare to reply to an encrypted message
if( recipient != null ) {
sign.setSelected(true);
- encrypt.setSelected(true);
+ encrypt.setSelected(true);
buddies.removeAllItems();
buddies.addItem(recipient);
buddies.setSelectedItem(recipient);
+ // dont allow to disable signing/encryption
+ fromTextField.setEditable(false);
+ sign.setEnabled(false);
+ encrypt.setEnabled(false);
+ buddies.setEnabled(false);
}
-
+
// set sig if msg is marked as signed
if( sign.isSelected() && signature != null ) {
text += signature;
@@ -1389,7 +1394,7 @@
if( encrypt.isSelected() ) {
buddies.setEnabled(true);
} else {
- buddies.setEnabled(true);
+ buddies.setEnabled(false);
}
}
// add signature if not existing
@@ -1404,6 +1409,7 @@
} else {
sender = "Anonymous";
fromTextField.setEditable(true);
+ encrypt.setSelected(false);
encrypt.setEnabled(false);
buddies.setEnabled(false);
// remove signature if existing
