Author: rozagh
Date: 2012-05-07 14:24:25 -0700 (Mon, 07 May 2012)
New Revision: 29136
Added:
core3/impl/trunk/log-swing-impl/src/main/resources/logConsole.png
Modified:
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyActivator.java
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CytoStatusBar.java
Log:
changing the log console button on the bottom of the application window to a
smaller button next to garbage collection.
Modified:
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyActivator.java
2012-05-07 21:06:52 UTC (rev 29135)
+++
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CyActivator.java
2012-05-07 21:24:25 UTC (rev 29136)
@@ -73,7 +73,7 @@
AdvancedQueueAppender advancedAppender = new
AdvancedQueueAppender(advancedQueue);
SimpleQueueAppender simpleAppender = new
SimpleQueueAppender(simpleQueue);
StatusBarQueueAppender statusBarAppender = new
StatusBarQueueAppender(statusBarQueue);
- CytoStatusBar cytoStatusBar = new
CytoStatusBar(cySwingApplicationRef,"/user-trash.png");
+ CytoStatusBar cytoStatusBar = new
CytoStatusBar(cySwingApplicationRef,"/user-trash.png", "/logConsole.png");
StatusBarUpdater statusBarUpdater = new
StatusBarUpdater(cytoStatusBar,statusBarQueue,statusBarConfigMap);
ConsoleTaskFactory consoleTaskFactory = new
ConsoleTaskFactory(simpleQueue,advancedQueue,executorService,cytoStatusBar,cySwingApplicationRef,taskManagerRef,logViewConfigMap,logViewConfigMap);
Modified:
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CytoStatusBar.java
===================================================================
---
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CytoStatusBar.java
2012-05-07 21:06:52 UTC (rev 29135)
+++
core3/impl/trunk/log-swing-impl/src/main/java/org/cytoscape/log/internal/CytoStatusBar.java
2012-05-07 21:24:25 UTC (rev 29136)
@@ -21,10 +21,12 @@
String lastMessage = null;
private final int uiUpdateDelay = 500;
private final String trashIconPath;
+ private final String logConsoleIcon;
- public CytoStatusBar(CySwingApplication app, String trashIconPath) {
+ public CytoStatusBar(CySwingApplication app, String trashIconPath,
String logIconPath) {
super();
this.trashIconPath = trashIconPath;
+ this.logConsoleIcon = logIconPath;
initGui();
app.getStatusToolBar().add(panel);
}
@@ -32,7 +34,7 @@
private void initGui() {
panel = new JPanel(new GridBagLayout());
- statusMessage = new JButton();
+ statusMessage = new JButton(new
ImageIcon(getClass().getResource(logConsoleIcon)));
statusMessage.setCursor(new Cursor(Cursor.HAND_CURSOR));
setFontSize(statusMessage, 9);
statusMessage.setToolTipText("Open Log Console");
@@ -62,17 +64,18 @@
// status
JPanel panel1 = new JPanel(new GridBagLayout());
panel1.setBorder(new EtchedBorder());
- panel1.add(statusMessage, new GridBagConstraints(0, 0, 1, 1,
1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0,
0, 0), 0, 0));
- panel.add(panel1, new GridBagConstraints(0, 0, 1, 1, 1, 1,
GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(3, 3, 2, 1), 0,
0));
+ panel1.add(statusMessage, new GridBagConstraints(0, 0, 1, 1,
1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0,
0, 0), 0, 0));
+ panel1.add(performGC, new GridBagConstraints(1, 0, 1, 1, 1.0,
1.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0,
0), 0, 0));
+ panel.add(panel1, new GridBagConstraints(0, 0, 1, 1, 1, 1,
GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(3, 1, 2, 2), 0,
0));
// memory
JPanel panel2 = new JPanel(new GridBagLayout());
panel2.setBorder(new EtchedBorder());
JPanel panel3 = new JPanel(new GridBagLayout());
// panel3.add(memoryAvailable, new GridBagConstraints(0, 0, 1, 1,
0, 0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0,
0), 0, 0));
- panel3.add(performGC, new GridBagConstraints(1, 0, 1, 1, 0, 0,
GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0,
0));
- panel2.add(panel3, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0,
0));
- panel.add(panel2, new GridBagConstraints(1, 0, 1, 1, 0, 1,
GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(3, 1, 2, 2), 0,
0));
+// panel3.add(performGC, new GridBagConstraints(1, 0, 1, 1, 0, 0,
GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0,
0));
+// panel2.add(panel3, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0,
0));
+// panel.add(panel2, new GridBagConstraints(1, 0, 1, 1, 0, 1,
GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(3, 1, 2, 2), 0,
0));
}
static void setFontSize(Component component, int size) {
Added: core3/impl/trunk/log-swing-impl/src/main/resources/logConsole.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/log-swing-impl/src/main/resources/logConsole.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
