Author: jflesch
Date: 2007-03-14 12:05:46 +0000 (Wed, 14 Mar 2007)
New Revision: 12114
Added:
trunk/apps/Thaw/images/computer.png
trunk/apps/Thaw/images/identity.png
trunk/apps/Thaw/images/peers.png
Removed:
trunk/apps/Thaw/images/peerMonitor.png
Modified:
trunk/apps/Thaw/images/queueWatcher.png
trunk/apps/Thaw/src/thaw/gui/IconBox.java
trunk/apps/Thaw/src/thaw/plugins/PeerMonitor.java
trunk/apps/Thaw/src/thaw/plugins/index/Link.java
trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
Log:
Add some icons
Added: trunk/apps/Thaw/images/computer.png
===================================================================
(Binary files differ)
Property changes on: trunk/apps/Thaw/images/computer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/apps/Thaw/images/identity.png
===================================================================
(Binary files differ)
Property changes on: trunk/apps/Thaw/images/identity.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/apps/Thaw/images/peerMonitor.png
===================================================================
(Binary files differ)
Added: trunk/apps/Thaw/images/peers.png
===================================================================
(Binary files differ)
Property changes on: trunk/apps/Thaw/images/peers.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/apps/Thaw/images/queueWatcher.png
===================================================================
(Binary files differ)
Modified: trunk/apps/Thaw/src/thaw/gui/IconBox.java
===================================================================
--- trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-03-14 10:58:04 UTC (rev
12113)
+++ trunk/apps/Thaw/src/thaw/gui/IconBox.java 2007-03-14 12:05:46 UTC (rev
12114)
@@ -76,15 +76,19 @@
public static ImageIcon queueWatcher;
public static ImageIcon importExport;
- public static ImageIcon peerMonitor;
+
public static ImageIcon minPeerMonitor;
-
public static ImageIcon minImportAction;
public static ImageIcon minExportAction;
public static ImageIcon database;
+ public static ImageIcon computer;
+ public static ImageIcon identity;
+ public static ImageIcon peers;
+
+
/**
* Not really used
*/
@@ -165,7 +169,9 @@
IconBox.minExportAction = IconBox.loadIcon("min-export.png");
IconBox.database = IconBox.loadIcon("database.png");
IconBox.minPeerMonitor =
IconBox.loadIcon("min-peerMonitor.png");
- IconBox.peerMonitor =
IconBox.loadIcon("peerMonitor.png");
+ IconBox.computer = IconBox.loadIcon("computer.png");
+ IconBox.identity = IconBox.loadIcon("identity.png");
+ IconBox.peers = IconBox.loadIcon("peers.png");
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/PeerMonitor.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/PeerMonitor.java 2007-03-14 10:58:04 UTC
(rev 12113)
+++ trunk/apps/Thaw/src/thaw/plugins/PeerMonitor.java 2007-03-14 12:05:46 UTC
(rev 12114)
@@ -122,7 +122,7 @@
}
public javax.swing.ImageIcon getIcon() {
- return thaw.gui.IconBox.peerMonitor;
+ return thaw.gui.IconBox.peers;
}
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Link.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Link.java 2007-03-14 10:58:04 UTC
(rev 12113)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Link.java 2007-03-14 12:05:46 UTC
(rev 12114)
@@ -169,7 +169,7 @@
if (publicKey == null)
reloadDataFromDb(id);
- name = Index.getNameFromKey(publicKey);
+ name =
Index.getNameFromKey(FreenetURIHelper.cleanURI(publicKey));
return name;
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
2007-03-14 10:58:04 UTC (rev 12113)
+++ trunk/apps/Thaw/src/thaw/plugins/index/UnknownIndexList.java
2007-03-14 12:05:46 UTC (rev 12114)
@@ -71,7 +71,7 @@
button = new JButton(IconBox.indexReuse);
button.setToolTipText(I18n.getMessage("thaw.plugin.index.addIndexesFromLink"));
- toolbarActions.add(new LinkManagementHelper.IndexAdder(button,
queueManager, indexBrowser, false));
+ toolbarActions.add(new LinkManagementHelper.IndexAdder(button,
queueManager, indexBrowser, true));
toolbarModifier.addButtonToTheToolbar(button);
list.addMouseListener(this);
Modified: trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
2007-03-14 10:58:04 UTC (rev 12113)
+++ trunk/apps/Thaw/src/thaw/plugins/peerMonitor/PeerMonitorPanel.java
2007-03-14 12:05:46 UTC (rev 12114)
@@ -28,6 +28,8 @@
import thaw.core.Config;
import thaw.core.I18n;
+import thaw.gui.IconBox;
+
public class PeerMonitorPanel implements ActionListener, ListSelectionListener
{
/* must match with color list */
@@ -89,7 +91,11 @@
v.add(I18n.getMessage("thaw.plugin.peerMonitor.nodeStats"));
peerList.setListData(v);
- peerPanel.add(new
JLabel(I18n.getMessage("thaw.plugin.peerMonitor.peerList")),
BorderLayout.NORTH);
+
+ JLabel peerListLabel = new
JLabel(I18n.getMessage("thaw.plugin.peerMonitor.peerList"));
+ peerListLabel.setIcon(IconBox.peers);
+
+ peerPanel.add(peerListLabel, BorderLayout.NORTH);
peerPanel.add(new JScrollPane(peerList), BorderLayout.CENTER);
@@ -100,6 +106,8 @@
JPanel refTitle = new JPanel(new BorderLayout());
refLabel = new
JLabel(I18n.getMessage("thaw.plugin.peerMonitor.yourReference"));
+ refLabel.setIcon(IconBox.identity);
+
refCopyButton = new
JButton(I18n.getMessage("thaw.plugin.peerMonitor.copyReference"));
refCopyButton.addActionListener(this);
@@ -388,6 +396,7 @@
detailsPanel.setLayout(new GridLayout(v.size()+1, 2));
detailsLabel.setText(title);
+ detailsLabel.setIcon(IconBox.computer);
for (Iterator i = v.iterator();
i.hasNext();) {
