Author: jflesch
Date: 2007-09-06 00:19:42 +0000 (Thu, 06 Sep 2007)
New Revision: 14980
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostPanel.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
Fix the draft panel : Wasn't hided correctly when the writing was finished
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java 2007-09-05
23:28:07 UTC (rev 14979)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/DraftPanel.java 2007-09-06
00:19:42 UTC (rev 14980)
@@ -45,6 +45,7 @@
public class DraftPanel implements ActionListener, MouseListener {
+ public final static int ATTACHMENT_LIST_HEIGHT = 50;
private Draft draft;
private JPanel panel;
@@ -137,13 +138,18 @@
JPanel southCenterPanel = new JPanel(new BorderLayout(3, 3));
addAttachment = new JButton(IconBox.attachment);
addAttachment.addActionListener(this);
+ addAttachment.setPreferredSize(new
java.awt.Dimension(ATTACHMENT_LIST_HEIGHT, ATTACHMENT_LIST_HEIGHT));
attachmentList = new JList();
attachmentList.setCellRenderer(new AttachmentRenderer());
attachmentList.addMouseListener(this);
attachmentList.setSelectionMode(javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ attachmentList.setPreferredSize(new
java.awt.Dimension(ATTACHMENT_LIST_HEIGHT, ATTACHMENT_LIST_HEIGHT));
+ JScrollPane attListScrollPanel = new
JScrollPane(attachmentList);
+ attListScrollPanel.setPreferredSize(new
java.awt.Dimension(ATTACHMENT_LIST_HEIGHT, ATTACHMENT_LIST_HEIGHT));
+
southCenterPanel.add(addAttachment, BorderLayout.WEST);
- southCenterPanel.add(new JScrollPane(attachmentList),
BorderLayout.CENTER);
+ southCenterPanel.add(attListScrollPanel, BorderLayout.CENTER);
centerPanel.add(new JScrollPane(textArea), BorderLayout.CENTER);
centerPanel.add(southCenterPanel, BorderLayout.SOUTH);
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostPanel.java
2007-09-05 23:28:07 UTC (rev 14979)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostPanel.java
2007-09-06 00:19:42 UTC (rev 14980)
@@ -113,8 +113,10 @@
if (gmailView)
mainSplit.setRightComponent(messageTreeTable.getPanel());
- else
+ else {
rightSplit.setLeftComponent(messageTreeTable.getPanel());
+ rightSplit.setRightComponent(messagePanel.getPanel());
+ }
mainSplit.validate();
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2007-09-05 23:28:07 UTC (rev 14979)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
2007-09-06 00:19:42 UTC (rev 14980)
@@ -299,6 +299,7 @@
public void update(final Observable o, final Object arg) {
if (o instanceof FCPTransferQuery
+ && queries.indexOf(o) >= 0
&& ((FCPTransferQuery)o).isFinished()) {
String str = null;
@@ -332,19 +333,19 @@
sortTable();
- if( queries != null && (i = queries.indexOf(o)) >= 0) {
+ if (queries != null && (i = queries.indexOf(o)) >= 0) {
if (oldPos != i)
this.notifyObservers(oldPos);
this.notifyObservers(i);
return;
}
- if(arg == null) {
+ if (o == queueManager && arg == null) {
reloadQueue();
return;
}
- if(o == queueManager) {
+ if (o == queueManager) {
final FCPTransferQuery query = (FCPTransferQuery)arg;
if((query.getQueryType() == 1) && isForInsertions)
