Author: rozagh
Date: 2012-07-02 15:32:10 -0700 (Mon, 02 Jul 2012)
New Revision: 29738
Modified:
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/io/datasource/internal/bookmarks/BookmarkDataSourceBuilder.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CreateNewNetworkPanel.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/HelpPanel.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/OpenPanel.java
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenDialog.java
Log:
fixes #1190 made the suggested changes. Also tried to make different
functionalities more visible. The recent session file addresses are italic, the
URL links in the help window are blue (to show they will direct user to a
webpage), and the functional labels are non-italic and black. All of the labels
that can be clicked also have a hand cursor.
Modified:
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/io/datasource/internal/bookmarks/BookmarkDataSourceBuilder.java
===================================================================
---
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/io/datasource/internal/bookmarks/BookmarkDataSourceBuilder.java
2012-07-02 20:06:34 UTC (rev 29737)
+++
core3/impl/trunk/datasource-impl/src/main/java/org/cytoscape/io/datasource/internal/bookmarks/BookmarkDataSourceBuilder.java
2012-07-02 22:32:10 UTC (rev 29738)
@@ -63,7 +63,7 @@
final String location = ds.getHref();
final String name = ds.getName();
final String description = "From
Bookmarks";
- final String provider = "Legacy";
+ final String provider = "Example";
URL url = null;
try {
url = new URL(location);
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CreateNewNetworkPanel.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CreateNewNetworkPanel.java
2012-07-02 20:06:34 UTC (rev 29737)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/CreateNewNetworkPanel.java
2012-07-02 22:32:10 UTC (rev 29738)
@@ -1,6 +1,7 @@
package org.cytoscape.welcome.internal;
import java.awt.Color;
+import java.awt.Cursor;
import java.awt.GridLayout;
import java.awt.Window;
import java.awt.event.ActionEvent;
@@ -49,8 +50,8 @@
private static final long serialVersionUID = -8750909701276867389L;
private static final Logger logger =
LoggerFactory.getLogger(CreateNewNetworkPanel.class);
private static final String LAYOUT_ALGORITHM = "force-directed";
- private static final String ICON_OPEN =
"images/Icons/net_file_import_small.png";
- private static final String ICON_DATABASE =
"images/Icons/net_db_import_small.png";
+ //private static final String ICON_OPEN =
"images/Icons/net_file_import_small.png";
+ //private static final String ICON_DATABASE =
"images/Icons/net_db_import_small.png";
private JLabel loadNetwork;
private JLabel fromDB;
@@ -119,7 +120,7 @@
private void initComponents() {
- BufferedImage openIconImg = null;
+ /* BufferedImage openIconImg = null;
BufferedImage databaseIconImg = null;
try {
openIconImg =
ImageIO.read(WelcomeScreenDialog.class.getClassLoader().getResource(ICON_OPEN));
@@ -129,15 +130,16 @@
}
ImageIcon openIcon = new ImageIcon(openIconImg);
- ImageIcon databaseIcon = new ImageIcon(databaseIconImg);
+ ImageIcon databaseIcon = new ImageIcon(databaseIconImg);*/
this.layout = new JCheckBox();
layout.setText("Apply preferred layout");
layout.setToolTipText("Note: This option may take minutes to
finish for large networks!");
this.loadNetwork = new JLabel("From file...");
- this.loadNetwork.setIcon(openIcon);
-
+ //this.loadNetwork.setIcon(openIcon);
+ this.loadNetwork.setCursor(new Cursor(Cursor.HAND_CURSOR));
+
loadNetwork.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent ev) {
@@ -149,9 +151,10 @@
this.setBorder(new LineBorder(new Color(0, 0, 0, 0), 10));
this.fromDB = new JLabel("From Reference Network Data:");
- this.fromDB.setIcon(databaseIcon);
+ //this.fromDB.setIcon(databaseIcon);
this.fromWebService = new JLabel("From Public Web Service...");
+ this.fromWebService.setCursor(new Cursor(Cursor.HAND_CURSOR));
this.fromWebService.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent ev) {
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/HelpPanel.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/HelpPanel.java
2012-07-02 20:06:34 UTC (rev 29737)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/HelpPanel.java
2012-07-02 22:32:10 UTC (rev 29738)
@@ -1,6 +1,7 @@
package org.cytoscape.welcome.internal;
import java.awt.Color;
+import java.awt.Cursor;
import java.awt.Font;
import java.awt.GridLayout;
import java.awt.event.MouseAdapter;
@@ -22,7 +23,7 @@
private static final long serialVersionUID = -1685752658901305871L;
private static final Font LABEL_FONT = new Font("SansSerif",
Font.PLAIN, 12);
- private static final Color LABEL_COLOR = new Color(0x40, 0x40, 0x40);
+ private static final Color LABEL_COLOR = Color.blue;
private JLabel about;
private JLabel manual;
@@ -72,6 +73,7 @@
label.setHorizontalAlignment(SwingConstants.LEFT);
label.setHorizontalTextPosition(SwingConstants.LEFT);
label.setOpaque(false);
+ label.setCursor(new Cursor(Cursor.HAND_CURSOR));
label.addMouseListener(new LabelMouseListener(label,
urlMap.get(label), this));
add(label);
}
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/OpenPanel.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/OpenPanel.java
2012-07-02 20:06:34 UTC (rev 29737)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/OpenPanel.java
2012-07-02 22:32:10 UTC (rev 29738)
@@ -1,6 +1,7 @@
package org.cytoscape.welcome.internal;
import java.awt.Color;
+import java.awt.Cursor;
import java.awt.Font;
import java.awt.GridLayout;
import java.awt.Window;
@@ -29,7 +30,7 @@
public class OpenPanel extends JPanel {
private static final long serialVersionUID = 591882944100485039L;
- private static final Font FILE_NAME_FONT = new Font(Font.DIALOG,
Font.PLAIN, 12);
+ private static final Font FILE_NAME_FONT = new Font(Font.DIALOG,
Font.ITALIC, 12);
private static final String ICON_LOCATION =
"/images/Icons/open_session.png";
private BufferedImage openIconImg;
private ImageIcon openIcon;
@@ -76,6 +77,7 @@
fileLabel.setFont(FILE_NAME_FONT);
fileLabel.setBorder(padLine);
fileLabel.setHorizontalAlignment(SwingConstants.LEFT);
+ fileLabel.setCursor(new Cursor(Cursor.HAND_CURSOR));
try {
fileLabel.setToolTipText(target.toURI().toString());
}
@@ -101,6 +103,7 @@
open.setIcon(openIcon);
open.setBorder(padLine);
open.setHorizontalAlignment(SwingConstants.LEFT);
+ open.setCursor(new Cursor(Cursor.HAND_CURSOR));
open.addMouseListener(new MouseAdapter() {
@Override
Modified:
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenDialog.java
===================================================================
---
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenDialog.java
2012-07-02 20:06:34 UTC (rev 29737)
+++
core3/impl/trunk/welcome-impl/src/main/java/org/cytoscape/welcome/internal/WelcomeScreenDialog.java
2012-07-02 22:32:10 UTC (rev 29738)
@@ -182,7 +182,7 @@
buildHelpPanel(panel1, new OpenPanel(this, fileTracker,
guiTaskManager, openSessionTaskFactory),
"Open a Recent Session");
- buildHelpPanel(panel2, new CreateNewNetworkPanel(this, bc,
guiTaskManager, importNetworkFileTF, loadNetworkTF, config, dsManager,
cyProps), "Create New Network");
+ buildHelpPanel(panel2, new CreateNewNetworkPanel(this, bc,
guiTaskManager, importNetworkFileTF, loadNetworkTF, config, dsManager,
cyProps), "Import Network");
buildHelpPanel(panel3, new HelpPanel(openBrowserServiceRef,
cyProps), "Help");
buildHelpPanel(panel4, new LogoPanel(), "Latest News");
--
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.
