Author: jflesch
Date: 2007-09-12 19:28:25 +0000 (Wed, 12 Sep 2007)
New Revision: 15130
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
Log:
Improve the 'outlook' layout in minifrost
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
2007-09-12 18:00:44 UTC (rev 15129)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
2007-09-12 19:28:25 UTC (rev 15130)
@@ -101,12 +101,6 @@
msgsPanel = new JPanel(new BorderLayout(0, 20));
msgsPanel.add(new JLabel(""), BorderLayout.CENTER);
- scrollPane = new JScrollPane(msgsPanel,
-
JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
-
JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- panel.add(scrollPane, BorderLayout.CENTER);
-
-
/* actions */
actions = new JComboBox(ACTIONS);
@@ -142,21 +136,31 @@
boolean gmailView = mainPanel.isInGmailView();
- if (gmailView)
+ if (gmailView) {
northNorthPanel.add(new JLabel(""),
BorderLayout.CENTER);
- else
- northNorthPanel.add(new JScrollPane(subject),
BorderLayout.CENTER);
+ northNorthPanel.add(actions, BorderLayout.EAST);
+ northNorthPanel.add(buttonPanel, BorderLayout.WEST);
+ northPanel.add(northNorthPanel, BorderLayout.CENTER);
+ northPanel.add(new JScrollPane(subject),
BorderLayout.SOUTH);
- northNorthPanel.add(actions, BorderLayout.EAST);
- northNorthPanel.add(buttonPanel, BorderLayout.WEST);
+ panel.add(northPanel, BorderLayout.NORTH);
- northPanel.add(northNorthPanel, BorderLayout.CENTER);
+ scrollPane = new JScrollPane(msgsPanel,
+
JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+
JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- if (gmailView)
- northPanel.add(new JScrollPane(subject),
BorderLayout.SOUTH);
+ } else { /* => if outlook layout */
+ JPanel globalPanel = new JPanel(new BorderLayout(10,
10));
+ globalPanel.add(subject, BorderLayout.NORTH);
+ globalPanel.add(msgsPanel, BorderLayout.CENTER);
- panel.add(northPanel, BorderLayout.NORTH);
+ scrollPane = new JScrollPane(globalPanel,
+
JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+
JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ }
+
+ panel.add(scrollPane, BorderLayout.CENTER);
}
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-09-12 18:00:44 UTC (rev 15129)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-09-12 19:28:25 UTC (rev 15130)
@@ -92,7 +92,7 @@
};
- public final static String[] ACTIONS = new String[] {
+ public final static String[] GMAIL_ACTIONS = new String[] {
I18n.getMessage("thaw.plugin.miniFrost.actions"),
I18n.getMessage("thaw.plugin.miniFrost.selectAll"),
I18n.getMessage("thaw.plugin.miniFrost.selectNone"),
@@ -103,7 +103,19 @@
I18n.getMessage("thaw.plugin.miniFrost.unarchivate")
};
+ public final static String[] OUTLOOK_ACTIONS = new String[] {
+ I18n.getMessage("thaw.plugin.miniFrost.actions"),
+ I18n.getMessage("thaw.plugin.miniFrost.reply"),
+ I18n.getMessage("thaw.plugin.miniFrost.selectAll"),
+ I18n.getMessage("thaw.plugin.miniFrost.selectNone"),
+ I18n.getMessage("thaw.plugin.miniFrost.markAsRead"),
+ I18n.getMessage("thaw.plugin.miniFrost.markAsNonRead"),
+ I18n.getMessage("thaw.plugin.miniFrost.newMessage"),
+ I18n.getMessage("thaw.plugin.miniFrost.archivate"),
+ I18n.getMessage("thaw.plugin.miniFrost.unarchivate")
+ };
+
public final static int FIRST_COLUMN_SIZE = 25;
public final static int DEFAULT_ROW_HEIGHT = 20;
@@ -140,6 +152,7 @@
private int minTrustLevelInt;
private boolean advancedMode;
+ private boolean gmailView;
/** for the thread tree **/
private MessageNodeTree messageNodeTree;
@@ -147,6 +160,7 @@
public MessageTreeTable(MiniFrostPanel mainPanel) {
this.mainPanel = mainPanel;
+ this.gmailView = mainPanel.isInGmailView();
orderBy = Board.ORDER_DATE;
desc = true;
@@ -186,7 +200,11 @@
northPanel.add(searchPanel, BorderLayout.CENTER);
- actions = new JComboBox(ACTIONS);
+ if (gmailView)
+ actions = new JComboBox(GMAIL_ACTIONS);
+ else
+ actions = new JComboBox(OUTLOOK_ACTIONS);
+
actions.addActionListener(this);
northPanel.add(actions, BorderLayout.EAST);
@@ -1189,9 +1207,16 @@
if (sel <= 0)
return;
- if (sel == 3 || sel == 4) { /* mark as (non-)read */
- boolean markAsRead = (sel == 3);
+ if (gmailView)
+ sel += 1;
+ if (sel == 1) { /* reply */
+
+ mainPanel.getMessagePanel().reply();
+
+ } else if (sel == 4 || sel == 5) { /* mark as
(non-)read */
+ boolean markAsRead = (sel == 4);
+
for (int i = 0 ; i < selected.length ; i++) {
if (selected[i]) {
model.getMsg(i).setRead(markAsRead);
@@ -1200,8 +1225,8 @@
}
mainPanel.getBoardTree().refresh(targetBoard);
- } else if (sel == 6 || sel == 7) { /* (un)archive */
- boolean archive = (sel == 6);
+ } else if (sel == 7 || sel == 8) { /* (un)archive */
+ boolean archive = (sel == 7);
for (int i = 0 ; i < selected.length ; i++) {
if (selected[i])
@@ -1210,11 +1235,11 @@
refresh();
mainPanel.getBoardTree().refresh(targetBoard);
- } else if (sel == 1 || sel == 2) { /* (un)select all */
- boolean select = (sel == 1);
+ } else if (sel == 2 || sel == 3) { /* (un)select all */
+ boolean select = (sel == 2);
model.setSelectedAll(select);
model.refresh();
- } else if (sel == 5) { /* new message */
+ } else if (sel == 6) { /* new message */
if (targetBoard != null) {
Draft draft =
targetBoard.getDraft(null);
mainPanel.getDraftPanel().setDraft(draft);
