Author: jflesch
Date: 2008-02-11 00:41:54 +0000 (Mon, 11 Feb 2008)
New Revision: 17773
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.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostConfigTab.java
Log:
MiniFrost: Minor change in the layout
Modified: trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2008-02-10
04:30:41 UTC (rev 17772)
+++ trunk/apps/Thaw/src/thaw/i18n/source.thaw_fr.properties 2008-02-11
00:41:54 UTC (rev 17773)
@@ -668,7 +668,7 @@
thaw.plugin.miniFrost.modifyRegexp=Modifier les r?gles de filtrage
-thaw.plugin.miniFrost.seeTree=Arbre de messages
+thaw.plugin.miniFrost.seeTree=Afficher les messages sous forme d'arbre
thaw.plugin.miniFrost.archiveAfter=Archiver automatiquement les messages apr?s:
thaw.plugin.miniFrost.deleteAfter=Effacer automatiquement les messages apr?s:
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2008-02-10 04:30:41 UTC
(rev 17772)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw.properties 2008-02-11 00:41:54 UTC
(rev 17773)
@@ -673,7 +673,7 @@
thaw.plugin.miniFrost.invalidRegexp=One of your regexp is invalid : X
thaw.plugin.miniFrost.modifyRegexp=Modify the filtering rules
-thaw.plugin.miniFrost.seeTree=Message tree
+thaw.plugin.miniFrost.seeTree=Display messages as a tree
thaw.plugin.miniFrost.archiveAfter=Automatically archive the messages after:
thaw.plugin.miniFrost.deleteAfter=Automatically delete the messages after:
Modified: trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties
===================================================================
--- trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2008-02-10 04:30:41 UTC
(rev 17772)
+++ trunk/apps/Thaw/src/thaw/i18n/thaw_fr.properties 2008-02-11 00:41:54 UTC
(rev 17773)
@@ -668,7 +668,7 @@
thaw.plugin.miniFrost.modifyRegexp=Modifier les r\u00e8gles de filtrage
-thaw.plugin.miniFrost.seeTree=Arbre de messages
+thaw.plugin.miniFrost.seeTree=Afficher les messages sous forme d'arbre
thaw.plugin.miniFrost.archiveAfter=Archiver automatiquement les messages
apr\u00e8s:
thaw.plugin.miniFrost.deleteAfter=Effacer automatiquement les messages
apr\u00e8s:
Modified: trunk/apps/Thaw/src/thaw/plugins/MiniFrost.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/MiniFrost.java 2008-02-10 04:30:41 UTC
(rev 17772)
+++ trunk/apps/Thaw/src/thaw/plugins/MiniFrost.java 2008-02-11 00:41:54 UTC
(rev 17773)
@@ -19,6 +19,7 @@
public class MiniFrost implements thaw.core.Plugin, ChangeListener {
public final static int DEFAULT_ARCHIVE_AFTER = 7; /* days */
public final static int DEFAULT_DELETE_AFTER = 60; /* days */
+ public final static boolean DISPLAY_AS_TREE = true;
private Core core;
private Hsqldb hsqldb;
@@ -46,6 +47,7 @@
core.getConfig().addListener("miniFrostArchiveAfter",
this);
core.getConfig().addListener("miniFrostDeleteAfter",
this);
core.getConfig().addListener("miniFrostView",
this);
+ core.getConfig().addListener("checkbox_miniFrost_seeTree",
this);
if (!loadDeps()
|| !initFactories()
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2008-02-10 04:30:41 UTC (rev 17772)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MessageTreeTable.java
2008-02-11 00:41:54 UTC (rev 17773)
@@ -48,6 +48,7 @@
import thaw.gui.IconBox;
import thaw.core.I18n;
import thaw.core.Logger;
+import thaw.plugins.MiniFrost;
import thaw.plugins.signatures.Identity;
import thaw.plugins.miniFrost.interfaces.Author;
@@ -130,7 +131,7 @@
private int orderBy;
private boolean desc;
- private CheckBox seeTree;
+ private boolean tree;
private CheckBox seeUnsigned;
private JComboBox minTrustLevel;
private int minTrustLevelInt;
@@ -263,33 +264,25 @@
true);
seeUnsigned.addActionListener(this);
- seeTree = new CheckBox(mainPanel.getConfig(),
- "miniFrost_seeTree",
-
I18n.getMessage("thaw.plugin.miniFrost.seeTree"),
- true);
- seeTree.addActionListener(this);
+ tree = MiniFrost.DISPLAY_AS_TREE;
+
+ if
(mainPanel.getConfig().getValue("checkbox_miniFrost_seeTree") != null) {
+ tree =
Boolean.valueOf(mainPanel.getConfig().getValue("checkbox_miniFrost_seeTree")).booleanValue();
+ }
- JPanel southWestPanel = new JPanel(new GridLayout(2, 1));
- southWestPanel.add(new JLabel(""));
- southWestPanel.add(seeTree);
-
- JPanel southEastPanel = new JPanel(new GridLayout(2, 1));
-
- JPanel southEastPanelTop = new JPanel(new GridLayout(1, 3, 5,
5));
+ JPanel southWestPanel = 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);
+ southWestPanel.add(seeUnsigned);
+ southWestPanel.add(seeArchived);
+ southWestPanel.add(seeRead);
- southEastPanel.add(southEastPanelTop);
- southEastPanel.add(minTrustLevelPanel);
JPanel southPanel = new JPanel(new BorderLayout(5, 5));
southPanel.add(southWestPanel, BorderLayout.WEST);
southPanel.add(new JLabel(""), BorderLayout.CENTER);
- southPanel.add(southEastPanel, BorderLayout.EAST);
+ southPanel.add(minTrustLevelPanel, BorderLayout.EAST);
panel.add(southPanel, BorderLayout.SOUTH);
@@ -590,7 +583,7 @@
return checkBoxRenderer;
}
- if (value instanceof MessageNode &&
seeTree.isSelected()) {
+ if (value instanceof MessageNode && tree) {
return
messageNodeTree.getTableCellRendererComponent(table,
value,
isSelected,
@@ -948,7 +941,7 @@
Vector rootNodes;
- if (seeTree.isSelected()) {
+ if (tree) {
/** Filling in messageNodeHashtable **/
Hashtable messageNodeHashtable = new
Hashtable(msgs.size());
@@ -1186,7 +1179,6 @@
if (e.getSource() == seeUnsigned
|| e.getSource() == minTrustLevel
|| e.getSource() == seeArchived
- || e.getSource() == seeTree
|| e.getSource() == seeRead) {
minTrustLevelInt =
Identity.getTrustLevel((String)(minTrustLevel.getSelectedItem()));
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostConfigTab.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostConfigTab.java
2008-02-10 04:30:41 UTC (rev 17772)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostConfigTab.java
2008-02-11 00:41:54 UTC (rev 17773)
@@ -1,5 +1,6 @@
package thaw.plugins.miniFrost;
+import javax.swing.JCheckBox;
import javax.swing.JPanel;
import javax.swing.JLabel;
import javax.swing.JComboBox;
@@ -50,10 +51,11 @@
private JRadioButton gmailView;
private JRadioButton outlookView;
+ private JCheckBox treeCheckBox;
public MiniFrostConfigTab(Config config,
- ConfigWindow configWindow,
- RegexpBlacklist regexpBlacklist) {
+ ConfigWindow configWindow,
+ RegexpBlacklist regexpBlacklist) {
this.config = config;
this.configWindow = configWindow;
this.regexpBlacklist = regexpBlacklist;
@@ -74,6 +76,8 @@
archiveAfter.addItem(Integer.toString(i)+ "
"+I18n.getMessage("thaw.plugin.miniFrost.days"));
deleteAfter.addItem( Integer.toString(i)+ "
"+I18n.getMessage("thaw.plugin.miniFrost.days"));
}
+
+ treeCheckBox = new
JCheckBox(I18n.getMessage("thaw.plugin.miniFrost.seeTree"));
panel.add(new
JLabel(I18n.getMessage("thaw.plugin.miniFrost.maxBoardsRefreshed")));
panel.add(maxBoards);
@@ -83,6 +87,10 @@
panel.add(new
JLabel(I18n.getMessage("thaw.plugin.miniFrost.deleteAfter")));
panel.add(deleteAfter);
+
+ panel.add(new JLabel(""));
+ panel.add(treeCheckBox);
+ panel.add(new JLabel(""));
JPanel regexpPanel = new JPanel(new BorderLayout());
regexpPanel.add(new JLabel(""), BorderLayout.CENTER);
@@ -99,7 +107,7 @@
JPanel southPanel = new JPanel(new BorderLayout());
southPanel.add(new
JLabel(I18n.getMessage("thaw.plugin.miniFrost.views")),
- BorderLayout.NORTH);
+ BorderLayout.NORTH);
ButtonGroup buttonGroup = new ButtonGroup();
@@ -113,13 +121,13 @@
gmailPanel.add(gmailView, BorderLayout.NORTH);
gmailPanel.add(new JLabel(IconBox.miniFrostGmailView,
- JLabel.LEFT),
- BorderLayout.CENTER);
+ JLabel.LEFT),
+ BorderLayout.CENTER);
outlookPanel.add(outlookView, BorderLayout.NORTH);
outlookPanel.add(new JLabel(IconBox.miniFrostOutlookView,
- JLabel.LEFT),
- BorderLayout.CENTER);
+ JLabel.LEFT),
+ BorderLayout.CENTER);
buttonGroup.add(gmailView);
@@ -140,8 +148,8 @@
public void display() {
configWindow.addObserver(this);
configWindow.addTab(I18n.getMessage("thaw.plugin.miniFrost"),
- thaw.gui.IconBox.minReadComments,
- globalPanel);
+ thaw.gui.IconBox.minReadComments,
+ globalPanel);
}
@@ -198,6 +206,14 @@
gmailView.setSelected(false);
outlookView.setSelected(true);
}
+
+ boolean s = MiniFrost.DISPLAY_AS_TREE;
+
+ if (config.getValue("checkbox_miniFrost_seeTree") != null) {
+ s =
Boolean.valueOf(config.getValue("checkbox_miniFrost_seeTree")).booleanValue();
+ }
+
+ treeCheckBox.setSelected(s);
}
@@ -221,6 +237,9 @@
config.setValue("miniFrostView",
(gmailView.isSelected() ? "0" : "1"));
+
+ config.setValue("checkbox_miniFrost_seeTree",
+
Boolean.toString(treeCheckBox.isSelected()));
} else if (param == configWindow.getCancelButton()) {
