Author: jflesch
Date: 2007-08-14 15:29:51 +0000 (Tue, 14 Aug 2007)
New Revision: 14688
Modified:
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/MessageTreeTable.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/BoardFactory.java
Log:
Make it possible to hide the messages already read
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-08-14
14:50:42 UTC (rev 14687)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2007-08-14
15:29:51 UTC (rev 14688)
@@ -591,8 +591,9 @@
thaw.plugin.miniFrost.onAllBoards=Sur toutes les boards
-thaw.plugin.miniFrost.seeArchived=Voir les messages archiv?s
-
+thaw.plugin.miniFrost.seeMessages=Voir les messages
+thaw.plugin.miniFrost.seeArchived=Archiv?s
+thaw.plugin.miniFrost.seeRead=Lus
thaw.plugin.miniFrost.maxBoardsRefreshed=Nombre maximum de boards rafraichies
simultan?ment
thaw.plugin.miniFrost.copyAllKeys=Copier toutes les clefs des fichiers joints
dans le presse-papier
@@ -601,7 +602,7 @@
thaw.plugin.miniFrost.downloadAll=T?l?charger tout les fichiers joints
thaw.plugin.miniFrost.hideStatusBelow=Cacher les status inf?rieurs ?:
-thaw.plugin.miniFrost.seeUnsigned=Voir les messages non-sign?s
+thaw.plugin.miniFrost.seeUnsigned=Non-sign?s
thaw.plugin.miniFrost.DUP=(DUP)
@@ -630,6 +631,5 @@
thaw.plugin.miniFrost.actions=[ACTIONS]
thaw.plugin.miniFrost.collision=Collision au moment de l'insertion d'un
message sur la board 'X'.\n Nouvel essai sur un nouveau slot.
-
thaw.plugin.miniFrost.outBox=[en cours d'envoi]
thaw.plugin.miniFrost.sentBox=[envoy?s]
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-08-14 14:50:42 UTC
(rev 14687)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2007-08-14 15:29:51 UTC
(rev 14688)
@@ -602,7 +602,10 @@
thaw.plugin.miniFrost.onAllBoards=On all boards
-thaw.plugin.miniFrost.seeArchived=See archived messages
+thaw.plugin.miniFrost.seeMessages=See messages:
+
+thaw.plugin.miniFrost.seeArchived=Archived
+thaw.plugin.miniFrost.seeRead=Read
thaw.plugin.miniFrost.maxBoardsRefreshed=Maximum number of boards being
refreshed at the same time
thaw.plugin.miniFrost.copyAllKeys=Copy all the keys of the joined files to
clipboard
@@ -611,7 +614,7 @@
thaw.plugin.miniFrost.downloadAll=Download all the files attached
thaw.plugin.miniFrost.hideStatusBelow=Hide status lower than:
-thaw.plugin.miniFrost.seeUnsigned=See unsigned messages
+thaw.plugin.miniFrost.seeUnsigned=Unsigned
thaw.plugin.miniFrost.anonymous=Anonymous
@@ -645,6 +648,5 @@
thaw.plugin.miniFrost.actions=[ACTIONS]
thaw.plugin.miniFrost.collision=Collision while inserting a message for the
board 'X'.\n Will try with another slot.
-
thaw.plugin.miniFrost.outBox=[outbox]
thaw.plugin.miniFrost.sentBox=[sent]
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-08-14 14:50:42 UTC
(rev 14687)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2007-08-14 15:29:51 UTC
(rev 14688)
@@ -591,7 +591,8 @@
thaw.plugin.miniFrost.onAllBoards=Sur toutes les boards
-thaw.plugin.miniFrost.seeArchived=Voir les messages archiv\u00e9s
+thaw.plugin.miniFrost.seeMessages=Voir les messages
+thaw.plugin.miniFrost.seeArchived=Archiv\u00e9s
thaw.plugin.miniFrost.maxBoardsRefreshed=Nombre maximum de boards rafraichies
simultan\u00e9ment
@@ -601,7 +602,7 @@
thaw.plugin.miniFrost.downloadAll=T\u00e9l\u00e9charger tout les fichiers
joints
thaw.plugin.miniFrost.hideStatusBelow=Cacher les status inf\u00e9rieurs \u00e0:
-thaw.plugin.miniFrost.seeUnsigned=Voir les messages non-sign\u00e9s
+thaw.plugin.miniFrost.seeUnsigned=Non-sign\u00e9s
thaw.plugin.miniFrost.DUP=(DUP)
@@ -630,6 +631,5 @@
thaw.plugin.miniFrost.actions=[ACTIONS]
thaw.plugin.miniFrost.collision=Collision au moment de l'insertion d'un
message sur la board 'X'.\n Nouvel essai sur un nouveau slot.
-
thaw.plugin.miniFrost.outBox=[en cours d'envoi]
thaw.plugin.miniFrost.sentBox=[envoy\u00e9s]
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-08-14 14:50:42 UTC (rev 14687)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2007-08-14 15:29:51 UTC (rev 14688)
@@ -123,6 +123,7 @@
private JButton searchButton;
private JButton nextUnread;
+ private CheckBox seeRead;
private CheckBox seeArchived;
private JComboBox actions;
@@ -214,6 +215,14 @@
/** some filters **/
+ /* read */
+
+ seeRead = new CheckBox(mainPanel.getConfig(),
+ "miniFrost_seeRead",
+
I18n.getMessage("thaw.plugin.miniFrost.seeRead"),
+ true);
+ seeRead.addActionListener(this);
+
/* archived */
seeArchived = new CheckBox(mainPanel.getConfig(),
@@ -257,9 +266,11 @@
JPanel southEastPanel = new JPanel(new GridLayout(2, 1));
- JPanel southEastPanelTop = new JPanel(new GridLayout(1, 2, 10,
10));
+ JPanel southEastPanelTop = new JPanel(new GridLayout(1, 3, 5,
5));
+ southEastPanelTop.add(new
JLabel(I18n.getMessage("thaw.plugin.miniFrost.seeMessages")));
southEastPanelTop.add(seeUnsigned);
southEastPanelTop.add(seeArchived);
+ southEastPanelTop.add(seeRead);
southEastPanel.add(southEastPanelTop);
southEastPanel.add(minTrustLevelPanel);
@@ -855,6 +866,7 @@
if ((!allBoards) && targetBoard != null) {
Vector rawMsgs = targetBoard.getMessages(keywords,
orderBy,
desc,
seeArchived.isSelected(),
+
seeRead.isSelected(),
seeUnsigned.isSelected(),
minTrustLevelInt);
@@ -874,6 +886,7 @@
for (int i = 0 ; i < factories.length ; i++) {
Vector boardMsgs =
factories[i].getAllMessages(keywords, orderBy, desc,
seeArchived.isSelected(),
+
seeRead.isSelected(),
seeUnsigned.isSelected(),
minTrustLevelInt);
for (Iterator it = boardMsgs.iterator();
@@ -1042,7 +1055,8 @@
if (e.getSource() == seeUnsigned
|| e.getSource() == minTrustLevel
|| e.getSource() == seeArchived
- || e.getSource() == seeTree) {
+ || e.getSource() == seeTree
+ || e.getSource() == seeRead) {
minTrustLevelInt =
Identity.getTrustLevel((String)(minTrustLevel.getSelectedItem()));
refresh();
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2007-08-14 14:50:42 UTC (rev 14687)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoard.java
2007-08-14 15:29:51 UTC (rev 14688)
@@ -75,10 +75,11 @@
int orderBy,
boolean desc,
boolean archived,
+ boolean read,
boolean unsigned,
int minTrustLevel) {
return getMessages(id, factory, this, keywords,
- orderBy, desc, archived, unsigned,
+ orderBy, desc, archived, read, unsigned,
minTrustLevel, false);
}
@@ -90,6 +91,7 @@
int orderBy,
boolean desc,
boolean archived,
+ boolean read,
boolean unsigned,
int minTrustLevel,
boolean allBoards) {
@@ -118,7 +120,11 @@
if (!archived)
archivedStr = "frostKSKMessages.archived = FALSE ";
+ String readStr = "";
+ if (!read)
+ readStr = " AND frostKSKMessages.read = FALSE ";
+
String keywordsStr = "";
if (keywords != null) {
@@ -168,6 +174,7 @@
" ON frostKSKMessages.sigId =
signatures.id "+
whereBase+
archivedStr+
+ readStr+
keywordsStr+
trustLvlStr+
"ORDER BY "+orderColumn;
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
2007-08-14 14:50:42 UTC (rev 14687)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/frostKSK/KSKBoardFactory.java
2007-08-14 15:29:51 UTC (rev 14688)
@@ -369,10 +369,10 @@
public Vector getAllMessages(String[] keywords, int orderBy,
- boolean desc, boolean archived,
+ boolean desc, boolean archived, boolean
read,
boolean unsigned, int minTrustLevel) {
return KSKBoard.getMessages(-1, this, null, keywords,
- orderBy, desc, archived,
+ orderBy, desc, archived, read,
unsigned, minTrustLevel, true);
}
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
2007-08-14 14:50:42 UTC (rev 14687)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/Board.java
2007-08-14 15:29:51 UTC (rev 14688)
@@ -25,6 +25,7 @@
int orderBy,
boolean desc,
boolean archived,
+ boolean read,
boolean unsigned,
int minTrustLevel);
Modified:
trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/BoardFactory.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/BoardFactory.java
2007-08-14 14:50:42 UTC (rev 14687)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/interfaces/BoardFactory.java
2007-08-14 15:29:51 UTC (rev 14688)
@@ -31,6 +31,7 @@
*/
public Vector getAllMessages(String[] keywords, int orderBy,
boolean desc, boolean archived,
+ boolean read,
boolean unsigned, int minTrustLevel);
public Vector getSentMessages();
