Author: jflesch
Date: 2008-01-28 00:44:03 +0000 (Mon, 28 Jan 2008)
New Revision: 17337
Modified:
trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
trunk/apps/Thaw/src/thaw/plugins/MiniFrost.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardTree.java
trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostPanel.java
Log:
MiniFrost : move the buttons to manage the boards to the toolbar
Modified: trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2008-01-28 00:23:57 UTC
(rev 17336)
+++ trunk/apps/Thaw/src/thaw/plugins/IndexBrowser.java 2008-01-28 00:44:03 UTC
(rev 17337)
@@ -187,7 +187,7 @@
return;
}
-
browserPanel.isVisible(core.getMainWindow().getTabbedPane().getSelectedIndex()
== tabId);
+
browserPanel.setVisible(core.getMainWindow().getTabbedPane().getSelectedIndex()
== tabId);
}
public javax.swing.ImageIcon getIcon() {
Modified: trunk/apps/Thaw/src/thaw/plugins/MiniFrost.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/MiniFrost.java 2008-01-28 00:23:57 UTC
(rev 17336)
+++ trunk/apps/Thaw/src/thaw/plugins/MiniFrost.java 2008-01-28 00:44:03 UTC
(rev 17337)
@@ -1,5 +1,8 @@
package thaw.plugins;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
import thaw.core.I18n;
import thaw.core.Core;
import thaw.core.Logger;
@@ -13,7 +16,7 @@
import thaw.plugins.miniFrost.RegexpBlacklist;
-public class MiniFrost implements thaw.core.Plugin {
+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 */
@@ -57,6 +60,10 @@
core.getConfigWindow(),
regexpBlacklist);
configTab.display();
+
+ miniFrostPanel.setVisible(true);
+
+ core.getMainWindow().getTabbedPane().addChangeListener(this);
return true;
}
@@ -143,6 +150,8 @@
}
public void stop() {
+ core.getMainWindow().getTabbedPane().removeChangeListener(this);
+
if (autoRefresh != null)
autoRefresh.stop();
@@ -156,6 +165,8 @@
if (hsqldb != null)
hsqldb.unregisterChild(this);
+
+ miniFrostPanel.setVisible(false);
}
public BoardFactory[] getFactories() {
@@ -175,4 +186,18 @@
public javax.swing.ImageIcon getIcon() {
return thaw.gui.IconBox.readComments;
}
+
+
+ public void stateChanged(ChangeEvent arg0) {
+ int tabId;
+
+ tabId =
core.getMainWindow().getTabbedPane().indexOfTab(I18n.getMessage("thaw.plugin.miniFrost"));
+
+ if (tabId < 0) {
+ Logger.warning(this, "Unable to find the tab !");
+ return;
+ }
+
+
miniFrostPanel.setVisible(core.getMainWindow().getTabbedPane().getSelectedIndex()
== tabId);
+ }
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2008-01-28 00:23:57 UTC (rev 17336)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexBrowserPanel.java
2008-01-28 00:44:03 UTC (rev 17337)
@@ -225,7 +225,7 @@
/**
* Called by IndexBrowser when the panel become visible
*/
- public void isVisible(boolean visibility) {
+ public void setVisible(boolean visibility) {
if (visibility) {
indexTree.getToolbarModifier().displayButtonsInTheToolbar();
} else {
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardTree.java 2008-01-28
00:23:57 UTC (rev 17336)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/BoardTree.java 2008-01-28
00:44:03 UTC (rev 17337)
@@ -2,7 +2,6 @@
import javax.swing.JPanel;
import java.util.Observable;
-import java.awt.GridLayout;
import java.awt.BorderLayout;
import javax.swing.JList;
@@ -30,6 +29,7 @@
import thaw.gui.IconBox;
import thaw.core.I18n;
+import thaw.plugins.ToolbarModifier;
import thaw.plugins.miniFrost.interfaces.BoardFactory;
import thaw.plugins.miniFrost.interfaces.Board;
@@ -50,6 +50,7 @@
private JList list;
private JPopupMenu rightClickMenu;
+ private ToolbarModifier toolbarModifier;
private Vector actions;
private MiniFrostPanel mainPanel;
@@ -126,50 +127,52 @@
rightClickMenu.add(item);
actions.add(new BoardManagementHelper.NewMessage(mainPanel,
item));
- /* buttons */
+ /* toolbar buttons */
- JPanel southPanel = new JPanel(new BorderLayout());
-
- JPanel buttonPanel = new JPanel(new GridLayout(2, 3));
-
+
JButton button;
+ toolbarModifier = new
ToolbarModifier(mainPanel.getPluginCore().getCore().getMainWindow());
- button = new JButton(IconBox.minAdd);
+ button = new JButton(IconBox.add);
button.setToolTipText(I18n.getMessage("thaw.common.add"));
actions.add(new BoardManagementHelper.BoardAdder(mainPanel,
button));
- buttonPanel.add(button);
+ toolbarModifier.addButtonToTheToolbar(button);
- button = new JButton(IconBox.minDelete);
+ button = new JButton(IconBox.delete);
button.setToolTipText(I18n.getMessage("thaw.common.remove"));
actions.add(new BoardManagementHelper.BoardRemover(mainPanel,
button));
- buttonPanel.add(button);
+ toolbarModifier.addButtonToTheToolbar(button);
- button = new JButton(IconBox.minRefreshAction);
+ button = new JButton(IconBox.refreshAction);
button.setToolTipText(I18n.getMessage("thaw.plugin.miniFrost.loadNewMessages"));
actions.add(new BoardManagementHelper.BoardRefresher(mainPanel,
button));
- buttonPanel.add(button);
+ toolbarModifier.addButtonToTheToolbar(button);
- button = new JButton(IconBox.minMarkAsRead);
+ button = new JButton(IconBox.markAsRead);
button.setToolTipText(I18n.getMessage("thaw.plugin.miniFrost.markAsRead"));
actions.add(new BoardManagementHelper.MarkAllAsRead(mainPanel,
button));
- buttonPanel.add(button);
+ toolbarModifier.addButtonToTheToolbar(button);
- button = new JButton(IconBox.minMsgNew);
+ button = new JButton(IconBox.msgNew);
button.setToolTipText(I18n.getMessage("thaw.plugin.miniFrost.newMessage"));
actions.add(new BoardManagementHelper.NewMessage(mainPanel,
button));
- buttonPanel.add(button);
+ toolbarModifier.addButtonToTheToolbar(button);
/* drafts state */
draftsState = new JLabel("");
updateDraftValues(0, 0);
- southPanel.add(new JLabel(""), BorderLayout.CENTER);
- southPanel.add(buttonPanel, BorderLayout.WEST);
- southPanel.add(draftsState, BorderLayout.SOUTH);
+ //southPanel.add(new JLabel(""), BorderLayout.CENTER);
+ //southPanel.add(buttonPanel, BorderLayout.WEST);
+ //southPanel.add(draftsState, BorderLayout.SOUTH);
- panel.add(southPanel, BorderLayout.SOUTH);
+ panel.add(draftsState, BorderLayout.SOUTH);
}
+
+ public ToolbarModifier getToolbarModifier() {
+ return toolbarModifier;
+ }
protected class BoardListRenderer extends DefaultListCellRenderer {
Modified: trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostPanel.java
2008-01-28 00:23:57 UTC (rev 17336)
+++ trunk/apps/Thaw/src/thaw/plugins/miniFrost/MiniFrostPanel.java
2008-01-28 00:44:03 UTC (rev 17337)
@@ -284,4 +284,12 @@
public boolean isInGmailView() {
return gmailView;
}
+
+ public void setVisible(boolean v) {
+ if (v) {
+
boardTree.getToolbarModifier().displayButtonsInTheToolbar();
+ } else {
+
boardTree.getToolbarModifier().hideButtonsInTheToolbar();
+ }
+ }
}
