Author: jflesch
Date: 2007-08-07 21:48:43 +0000 (Tue, 07 Aug 2007)
New Revision: 14521
Modified:
trunk/apps/Thaw/src/thaw/gui/IconBox.java
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardManagementHelper.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardTree.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
Log:
Make the possibility to make all the message as read clearer
Modified: trunk/apps/Thaw/src/thaw/gui/IconBox.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-08-07 21:18:47 UTC (rev
14520)
+++ trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-08-07 21:48:43 UTC (rev
14521)
@@ -165,7 +165,10 @@
public static ImageIcon windowNew;
public static ImageIcon minWindowNew;
+ public static ImageIcon markAsRead;
+ public static ImageIcon minMarkAsRead;
+
/**
* Not really used
*/
@@ -275,6 +278,8 @@
IconBox.indexSettings =
IconBox.loadIcon("images/indexSettings.png");
IconBox.addComment =
IconBox.loadIcon("images/mail-message-new.png");
IconBox.minAddComment =
IconBox.loadIcon("images/min-mail-message-new.png");
+ IconBox.markAsRead =
IconBox.loadIcon("images/mail-message-new.png");
+ IconBox.minMarkAsRead =
IconBox.loadIcon("images/min-mail-message-new.png");
IconBox.readComments =
IconBox.loadIcon("images/readComments.png");
IconBox.minReadComments =
IconBox.loadIcon("images/min-readComments.png");
IconBox.minRed =
IconBox.loadIcon("images/min-red.png");
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-08-07
21:18:47 UTC (rev 14520)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-08-07
21:48:43 UTC (rev 14521)
@@ -613,3 +613,4 @@
thaw.plugin.miniFrost.days=jours
+thaw.plugin.miniFrost.actions=[ACTIONS]
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-08-07 21:18:47 UTC
(rev 14520)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-08-07 21:48:43 UTC
(rev 14521)
@@ -628,3 +628,5 @@
thaw.plugin.miniFrost.archiveAfter=Automatically archive the messages after:
thaw.plugin.miniFrost.deleteAfter=Automatically delete the messages after:
thaw.plugin.miniFrost.days=days
+
+thaw.plugin.miniFrost.actions=[ACTIONS]
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-08-07 21:18:47 UTC
(rev 14520)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-08-07 21:48:43 UTC
(rev 14521)
@@ -398,6 +398,7 @@
thaw.plugin.index.category=Tri automatique dans:
thaw.plugin.index.changeCategory=Changer
+thaw.plugin.index.categoryUnspecified=[Non-sp\u00e9cifi\u00e9]
# Peer monitor
@@ -612,3 +613,4 @@
thaw.plugin.miniFrost.days=jours
+thaw.plugin.miniFrost.actions=[ACTIONS]
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardManagementHelper.java
2007-08-07 21:18:47 UTC (rev 14520)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardManagementHelper.java
2007-08-07 21:48:43 UTC (rev 14521)
@@ -16,6 +16,7 @@
import javax.swing.JDialog;
import java.util.Vector;
+import java.util.Iterator;
import javax.swing.JOptionPane;
@@ -24,6 +25,7 @@
import thaw.plugins.miniFrost.interfaces.Board;
import thaw.plugins.miniFrost.interfaces.BoardFactory;
+import thaw.plugins.miniFrost.interfaces.Message;
public class BoardManagementHelper {
@@ -91,7 +93,7 @@
public void setTarget(Board board) {
- this.target = target;
+ this.target = board;
}
public void apply() {
@@ -109,6 +111,55 @@
+ public static class MarkAllAsRead extends BasicBoardAction {
+ private MiniFrostPanel mainPanel;
+ private AbstractButton source;
+
+ private Board target;
+
+
+ public MarkAllAsRead(MiniFrostPanel mainPanel, AbstractButton
source) {
+ super();
+
+ this.mainPanel = mainPanel;
+ this.source = source;
+
+ if (source != null) {
+ source.addActionListener(this);
+ source.setEnabled(false);
+ }
+ }
+
+
+ public void setTarget(Board board) {
+ if (source != null)
+ source.setEnabled(board != null);
+ this.target = board;
+ }
+
+ public void apply() {
+ if (target == null) {
+ Logger.warning(this, "No target ?!");
+ return;
+ }
+
+ /* quick and dirty */
+ Vector msgs = target.getMessages(null,
Board.ORDER_DATE, true,
+ false, true,
Integer.MIN_VALUE);
+
+ for (Iterator it = msgs.iterator();
+ it.hasNext();) {
+ ((Message)it.next()).setRead(true);
+ }
+
+ mainPanel.getMessageTreeTable().refresh();
+ mainPanel.getBoardTree().refresh();
+ }
+ }
+
+
+
+
public static class BoardRemover implements BoardAction {
private MiniFrostPanel mainPanel;
private AbstractButton source;
@@ -145,6 +196,7 @@
}
+
public static class BoardRefresher implements BoardAction {
private MiniFrostPanel mainPanel;
private AbstractButton source;
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardTree.java 2007-08-07
21:18:47 UTC (rev 14520)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardTree.java 2007-08-07
21:48:43 UTC (rev 14521)
@@ -118,11 +118,16 @@
rightClickMenu.add(item);
actions.add(new BoardManagementHelper.BoardRefresher(mainPanel,
item));
+ item = new
JMenuItem(I18n.getMessage("thaw.plugin.miniFrost.markAsRead"),
+ IconBox.minMarkAsRead);
+ rightClickMenu.add(item);
+ actions.add(new BoardManagementHelper.MarkAllAsRead(mainPanel,
item));
+
/* buttons */
JPanel southPanel = new JPanel(new BorderLayout());
- JPanel buttonPanel = new JPanel(new GridLayout(1, 2));
+ JPanel buttonPanel = new JPanel(new GridLayout(2, 2));
JButton button;
@@ -141,6 +146,11 @@
actions.add(new BoardManagementHelper.BoardRefresher(mainPanel,
button));
buttonPanel.add(button);
+ button = new JButton(IconBox.minMarkAsRead);
+
button.setToolTipText(I18n.getMessage("thaw.plugin.miniFrost.markAsRead"));
+ actions.add(new BoardManagementHelper.MarkAllAsRead(mainPanel,
button));
+ buttonPanel.add(button);
+
/* drafts state */
draftsState = new JLabel("");
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
2007-08-07 21:18:47 UTC (rev 14520)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
2007-08-07 21:48:43 UTC (rev 14521)
@@ -40,7 +40,7 @@
public final static String[] ACTIONS = {
- "",
+ I18n.getMessage("thaw.plugin.miniFrost.actions"),
I18n.getMessage("thaw.plugin.miniFrost.reply"),
I18n.getMessage("thaw.plugin.miniFrost.archivate"),
I18n.getMessage("thaw.plugin.miniFrost.unarchivate"),
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-08-07 21:18:47 UTC (rev 14520)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-08-07 21:48:43 UTC (rev 14521)
@@ -92,7 +92,7 @@
public final static String[] ACTIONS = new String[] {
- "",
+ I18n.getMessage("thaw.plugin.miniFrost.actions"),
I18n.getMessage("thaw.plugin.miniFrost.selectAll"),
I18n.getMessage("thaw.plugin.miniFrost.selectNone"),
I18n.getMessage("thaw.plugin.miniFrost.markAsRead"),
