Author: jflesch
Date: 2007-07-24 13:51:29 +0000 (Tue, 24 Jul 2007)
New Revision: 14299
Modified:
trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
trunk/apps/Thaw/src/thaw/i18n/thaw.properties
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
Log:
Add an option to unarchive a message
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-07-24
13:46:31 UTC (rev 14298)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-07-24
13:51:29 UTC (rev 14299)
@@ -527,7 +527,10 @@
thaw.plugin.miniFrost.read=Lire
thaw.plugin.miniFrost.rawMessage=MESSAGE BRUTE
+
thaw.plugin.miniFrost.archivate=Archiver
+thaw.plugin.miniFrost.unarchivate=D?archiver
+
thaw.plugin.miniFrost.reply=Repondre
thaw.plugin.miniFrost.unfoldAll=Tout d?plier
thaw.plugin.miniFrost.foldAll=Tout plier
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-07-24 13:46:31 UTC
(rev 14298)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-07-24 13:51:29 UTC
(rev 14299)
@@ -543,6 +543,7 @@
# error one time, error forever ... ("archivate")
thaw.plugin.miniFrost.archivate=Archive
+thaw.plugin.miniFrost.unarchivate=Unarchive
thaw.plugin.miniFrost.reply=Reply
thaw.plugin.miniFrost.unfoldAll=Unfold all
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
2007-07-24 13:46:31 UTC (rev 14298)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessagePanel.java
2007-07-24 13:51:29 UTC (rev 14299)
@@ -34,6 +34,7 @@
public final static String[] ACTIONS = {
"",
I18n.getMessage("thaw.plugin.miniFrost.archivate"),
+ I18n.getMessage("thaw.plugin.miniFrost.unarchivate"),
I18n.getMessage("thaw.plugin.miniFrost.reply"),
I18n.getMessage("thaw.plugin.miniFrost.unfoldAll"),
I18n.getMessage("thaw.plugin.miniFrost.foldAll")
@@ -310,12 +311,13 @@
int sel = actions.getSelectedIndex();
- if (sel == 1) { /* archivate */
+ if (sel == 1 || sel == 2) { /* (un)archive */
+ boolean archive = (sel == 1);
- msg.setArchived(true);
+ msg.setArchived(archive);
mainPanel.getMessageTreeTable().refresh();
- if (!nextUnread())
+ if (archive && !nextUnread())
mainPanel.displayMessageTable();
} else if (sel == 2) { /* reply */
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-07-24 13:46:31 UTC (rev 14298)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-07-24 13:51:29 UTC (rev 14299)
@@ -74,7 +74,8 @@
I18n.getMessage("thaw.plugin.miniFrost.selectNone"),
I18n.getMessage("thaw.plugin.miniFrost.markAsRead"),
I18n.getMessage("thaw.plugin.miniFrost.markAsNonRead"),
- I18n.getMessage("thaw.plugin.miniFrost.archivate")
+ I18n.getMessage("thaw.plugin.miniFrost.archivate"),
+ I18n.getMessage("thaw.plugin.miniFrost.unarchivate")
};
@@ -482,10 +483,12 @@
}
mainPanel.getBoardTree().refresh(targetBoard);
- } else if (sel == 5) { /* archive */
+ } else if (sel == 5 || sel == 6) { /* (un)archive */
+ boolean archive = (sel == 5);
+
for (int i = 0 ; i < selected.length ; i++) {
if (selected[i])
-
model.getMsg(i).setArchived(true);
+
model.getMsg(i).setArchived(archive);
}
refresh();
