Author: jflesch
Date: 2006-11-30 22:42:43 +0000 (Thu, 30 Nov 2006)
New Revision: 11156
Modified:
trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
Log:
Replace the two JLabel in the 'state' tab by two buttons
Modified: trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2006-11-30 22:24:58 UTC
(rev 11155)
+++ trunk/apps/Thaw/src/thaw/plugins/FetchPlugin.java 2006-11-30 22:42:43 UTC
(rev 11156)
@@ -71,9 +71,8 @@
queueWatcher =
(QueueWatcher)core.getPluginManager().getPlugin("thaw.plugins.QueueWatcher");
queueWatcher.addButtonToTheToolbar(buttonInToolBar);
-
- /* WARNING: This menu item can't be remove cleanly ... :/ */
queueWatcher.addMenuItemToTheDownloadTable(menuItem);
+ queueWatcher.addButtonListener(QueueWatcher.DOWNLOAD_PANEL,
this);
return true;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2006-11-30 22:24:58 UTC
(rev 11155)
+++ trunk/apps/Thaw/src/thaw/plugins/InsertPlugin.java 2006-11-30 22:42:43 UTC
(rev 11156)
@@ -81,9 +81,8 @@
queueWatcher =
(QueueWatcher)core.getPluginManager().getPlugin("thaw.plugins.QueueWatcher");
queueWatcher.addButtonToTheToolbar(buttonInToolBar);
-
- /* WARNING: This menu item can't be remove cleanly ... :/ */
queueWatcher.addMenuItemToTheInsertionTable(menuItem);
+ queueWatcher.addButtonListener(QueueWatcher.INSERTION_PANEL,
this);
return true;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2006-11-30 22:24:58 UTC
(rev 11155)
+++ trunk/apps/Thaw/src/thaw/plugins/QueueWatcher.java 2006-11-30 22:42:43 UTC
(rev 11156)
@@ -3,12 +3,14 @@
import javax.swing.JPanel;
import javax.swing.JSplitPane;
import java.awt.GridLayout;
+import java.awt.event.ActionListener;
import java.util.Vector;
import java.util.Iterator;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.ChangeEvent;
+import javax.swing.JButton;
import thaw.core.*;
@@ -22,7 +24,10 @@
//private JPanel mainPanel;
private JSplitPane mainPanel;
+ public final static int DOWNLOAD_PANEL = 0;
+ public final static int INSERTION_PANEL = 1;
private QueuePanel[] queuePanels = new QueuePanel[2];
+
private DetailPanel detailPanel;
private DragAndDropManager dnd;
@@ -48,8 +53,8 @@
this.detailPanel = new DetailPanel(core);
- queuePanels[0] = new QueuePanel(core, detailPanel, false); /*
download */
- queuePanels[1] = new QueuePanel(core, detailPanel, true); /*
upload */
+ queuePanels[DOWNLOAD_PANEL] = new QueuePanel(core, detailPanel,
false); /* download */
+ queuePanels[INSERTION_PANEL] = new QueuePanel(core,
detailPanel, true); /* upload */
split = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
queuePanels[0].getPanel(),
@@ -106,7 +111,14 @@
return true;
}
+ /**
+ * @param panel see DOWNLOAD_PANEL and INSERTION_PANEL
+ */
+ public void addButtonListener(int panel, ActionListener listener) {
+ queuePanels[panel].getButton().addActionListener(listener);
+ }
+
public boolean stop() {
Logger.info(this, "Stopping plugin \"QueueWatcher\" ...");
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2006-11-30 22:24:58 UTC (rev 11155)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2006-11-30 22:42:43 UTC (rev 11156)
@@ -3,11 +3,13 @@
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.JLabel;
+import javax.swing.JButton;
import javax.swing.JScrollPane;
import javax.swing.JProgressBar;
import javax.swing.JFileChooser;
import javax.swing.SwingConstants;
+import java.awt.Dimension;
import java.awt.BorderLayout;
import java.awt.Component;
import java.util.Vector;
@@ -43,7 +45,7 @@
public class QueuePanel implements MouseListener, ActionListener, KeyListener {
private Core core;
- private JLabel label;
+ private JButton button;
private JTable table = null;
private JScrollPane scrollPane = null;
@@ -92,19 +94,26 @@
header.setReorderingAllowed(true);
if(isForInsertionQueue) {
- this.label = new
JLabel(I18n.getMessage("thaw.common.insertions"));
- this.label.setIcon(IconBox.insertions);
+ button = new
JButton(I18n.getMessage("thaw.common.insertions"));
+ button.setIcon(IconBox.insertions);
} else {
- this.label = new
JLabel(I18n.getMessage("thaw.common.downloads"));
- this.label.setIcon(IconBox.downloads);
+ button = new
JButton(I18n.getMessage("thaw.common.downloads"));
+ button.setIcon(IconBox.downloads);
}
- this.label.setVerticalAlignment(SwingConstants.CENTER);
+ button.setVerticalAlignment(SwingConstants.CENTER);
+ button.setHorizontalAlignment(SwingConstants.LEFT);
+ button.setPreferredSize(new Dimension(190, 40));
+ JPanel buttonPanel = new JPanel(new BorderLayout());
+ buttonPanel.add(button, BorderLayout.EAST);
+ buttonPanel.add(new JLabel(""), BorderLayout.CENTER);
+
this.panel = new JPanel();
this.panel.setLayout(new BorderLayout());
- this.panel.add(this.label, BorderLayout.NORTH);
+ this.panel.add(buttonPanel, BorderLayout.NORTH);
+
this.scrollPane = new JScrollPane(this.table);
this.panel.add(this.scrollPane, BorderLayout.CENTER);
@@ -180,7 +189,11 @@
rightClickMenu.insert(item, 0);
}
+ public JButton getButton() {
+ return button;
+ }
+
private class ProgressRenderer extends DefaultTableCellRenderer {
private final static long serialVersionUID = 20060709;
