Skip to content

Commit

Permalink
Refs #4318: Adds TOOLTIP_LONG_DESCRIPTION property to toolbar actions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrtannus
chrtannus committed Sep 11, 2018
1 parent 1fcb29d commit 71d919d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 8 deletions.
28 changes: 21 additions & 7 deletions core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
View file
Expand Up @@ -51,6 +51,7 @@
import static org.cytoscape.work.ServiceProperties.TITLE;
import static org.cytoscape.work.ServiceProperties.TOOLTIP;
import static org.cytoscape.work.ServiceProperties.TOOLTIP_IMAGE;
import static org.cytoscape.work.ServiceProperties.TOOLTIP_LONG_DESCRIPTION;
import static org.cytoscape.work.ServiceProperties.TOOL_BAR_GRAVITY;

import java.awt.Font;
Expand Down Expand Up @@ -517,6 +518,7 @@ private void createLayoutTaskFactories(BundleContext bc) {
props.setProperty(IN_TOOL_BAR, "true");
props.setProperty(MENU_GRAVITY, "5.0");
props.setProperty(TOOLTIP, "Apply Preferred Layout");
props.setProperty(TOOLTIP_LONG_DESCRIPTION, "Applies the preferred layout to the selected views.");
registerService(bc, factory, NetworkViewCollectionTaskFactory.class, props);
registerService(bc, factory, ApplyPreferredLayoutTaskFactory.class, props);

Expand Down Expand Up @@ -680,6 +682,7 @@ private void createViewTaskFactories(BundleContext bc) {
props.setProperty(LARGE_ICON_ID, iconId);
props.setProperty(ENABLE_FOR, ENABLE_FOR_NETWORK_AND_VIEW);
props.setProperty(TOOLTIP, "Zoom In");
props.setProperty(TOOLTIP_LONG_DESCRIPTION, "Zooms in the current view.");
props.setProperty(TOOL_BAR_GRAVITY, "5.1");
props.setProperty(IN_TOOL_BAR, "true");
// props.setProperty(COMMAND, "zoom in");
Expand All @@ -697,6 +700,7 @@ private void createViewTaskFactories(BundleContext bc) {
props.setProperty(PREFERRED_MENU, "View");
props.setProperty(TITLE, "Zoom Out");
props.setProperty(TOOLTIP, "Zoom Out");
props.setProperty(TOOLTIP_LONG_DESCRIPTION, "Zooms out the current view.");
props.setProperty(MENU_GRAVITY, "6.4");
props.setProperty(INSERT_SEPARATOR_AFTER, "true");
props.setProperty(ACCELERATOR, "cmd minus");
Expand All @@ -718,7 +722,8 @@ private void createViewTaskFactories(BundleContext bc) {
Properties props = new Properties();
props.setProperty(PREFERRED_MENU, "View");
props.setProperty(TITLE, "Fit Selected");
props.setProperty(TOOLTIP, "Changes the current view's zoom and viewport so the selected nodes and edges fit into the displayed view area.");
props.setProperty(TOOLTIP, "Fit Selected");
props.setProperty(TOOLTIP_LONG_DESCRIPTION, "Changes the current view's zoom and viewport so the selected nodes and edges fit into the displayed view area.");
props.setProperty(MENU_GRAVITY, "6.2");
props.setProperty(ACCELERATOR, "cmd 9");
props.setProperty(LARGE_ICON_ID, iconId);
Expand Down Expand Up @@ -746,7 +751,8 @@ private void createViewTaskFactories(BundleContext bc) {
Properties props = new Properties();
props.setProperty(PREFERRED_MENU, "View");
props.setProperty(TITLE, "Fit Content");
props.setProperty(TOOLTIP, "Zooms out the current view in order to display all of its elements.");
props.setProperty(TOOLTIP, "Fit Content");
props.setProperty(TOOLTIP_LONG_DESCRIPTION, "Zooms out the current view in order to display all of its elements.");
props.setProperty(TOOLTIP_IMAGE, getClass().getResource("/images/tooltips/fit-content.gif").toString());
props.setProperty(MENU_GRAVITY, "6.1");
props.setProperty(ACCELERATOR, "cmd 0");
Expand Down Expand Up @@ -933,6 +939,7 @@ private void createNodeEdgeTaskFactories(BundleContext bc) {
props.setProperty(LARGE_ICON_ID, iconId);
props.setProperty(IN_TOOL_BAR, "true");
props.setProperty(TOOLTIP, "First Neighbors of Selected Nodes (Undirected)");
props.setProperty(TOOLTIP_LONG_DESCRIPTION, "Selects the first neighbors of the current network's selected nodes (undirected).");
// props.setProperty(C OMMAND, "select first neighbors undirected");
// props.setProperty(COMMAND_NAMESPACE, "node");
registerService(bc, factory, NetworkTaskFactory.class, props);
Expand Down Expand Up @@ -1731,7 +1738,8 @@ private void createTableTaskFactories(BundleContext bc) {
props.setProperty(TITLE, "Table from File...");
props.setProperty(LARGE_ICON_ID, iconId);
props.setProperty(IN_TOOL_BAR, "true");
props.setProperty(TOOLTIP, "Table from File...");
props.setProperty(TOOLTIP, "Import Table from File");
props.setProperty(TOOLTIP_LONG_DESCRIPTION, "Reads a table from the file system and adds it to the current session.");
props.setProperty(COMMAND_LONG_DESCRIPTION, "Reads a table from the file system. Requires a string containing the absolute path of the file. Returns the SUID of the table created.");
props.setProperty(COMMAND_SUPPORTS_JSON, "true");
props.setProperty(COMMAND_EXAMPLE_JSON, "{\"mappedTables\": [101,102]}");
Expand All @@ -1744,7 +1752,7 @@ private void createTableTaskFactories(BundleContext bc) {
props.setProperty(PREFERRED_MENU, "File.Import[23.0]"); //.Table[23.0]
props.setProperty(MENU_GRAVITY, "6.0");
props.setProperty(TITLE, "Table from URL...");
props.setProperty(TOOLTIP, "Import Table From URL...");
props.setProperty(TOOLTIP, "Import Table From URL");
props.setProperty(COMMAND_LONG_DESCRIPTION, "Reads a table from the Internet. Requires a valid URL pointing to the file. Returns the SUID of the table created.");
props.setProperty(COMMAND_SUPPORTS_JSON, "true");
props.setProperty(COMMAND_EXAMPLE_JSON, "{\"mappedTables\": [101,102]}");
Expand Down Expand Up @@ -2184,7 +2192,9 @@ private void createNetworkTaskFactories(BundleContext bc, CyGroupManager cyGroup
props.setProperty(TOOL_BAR_GRAVITY, "10.1");
props.setProperty(IN_TOOL_BAR, "true");
props.setProperty(MENU_GRAVITY, "1.0");
props.setProperty(TOOLTIP, "New Network From Selection (all edges)");
props.setProperty(TOOLTIP, "New Network from Selection (All Edges)");
props.setProperty(TOOLTIP_LONG_DESCRIPTION,
"Creates a new network (and view) that will contain the selected nodes and all of their edges.");
// props.setProperty(COMMAND, "create from selected nodes and all edges");
// props.setProperty(COMMAND_NAMESPACE, "network");
registerService(bc, factory, NetworkTaskFactory.class, props);
Expand Down Expand Up @@ -2240,7 +2250,9 @@ private void createNetworkTaskFactories(BundleContext bc, CyGroupManager cyGroup
props.setProperty(TOOL_BAR_GRAVITY, "2.0");
props.setProperty(LARGE_ICON_ID, iconId);
props.setProperty(IN_TOOL_BAR, "true");
props.setProperty(TOOLTIP, "Open a network from a file on the file system.");
props.setProperty(TOOLTIP, "Import Network from File System.");
props.setProperty(TOOLTIP_LONG_DESCRIPTION,
"Opens a network from a file and adds it to the current session.");
registerService(bc, factory, TaskFactory.class, props);
registerService(bc, factory, LoadNetworkFileTaskFactory.class, props);
}
Expand Down Expand Up @@ -2481,6 +2493,7 @@ private void createSessionTaskFactories(BundleContext bc) {
props.setProperty(IN_TOOL_BAR, "true");
props.setProperty(MENU_GRAVITY, "0.5");
props.setProperty(TOOLTIP, "Open Session");
props.setProperty(TOOLTIP_LONG_DESCRIPTION, "Opens a session file (.cys) from the file system.");
registerService(bc, factory, OpenSessionTaskFactory.class, props);
registerService(bc, factory, TaskFactory.class, props);

Expand Down Expand Up @@ -2630,7 +2643,8 @@ private void createHelpTaskFactories(BundleContext bc) {
props.setProperty(ACCELERATOR, "cmd ?");
props.setProperty(LARGE_ICON_ID, iconId);
props.setProperty(TITLE, "Help");
props.setProperty(TOOLTIP, "Link to context sensitive help");
props.setProperty(TOOLTIP, "Help");
props.setProperty(TOOLTIP_LONG_DESCRIPTION, "Opens a web page that contains context sensitive help.");
props.setProperty(TOOL_BAR_GRAVITY, "" + Float.MAX_VALUE);
props.setProperty(IN_TOOL_BAR, "true");
registerService(bc, factory, TaskFactory.class, props);
Expand Down
2 changes: 1 addition & 1 deletion swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeToolBar.java
View file
Expand Up @@ -364,8 +364,8 @@ public static JButton createToolBarButton(CyAction action) {
public JToolTip createToolTip() {
return new CyToolTip(
this,
action.getName(),
(String) action.getValue(Action.SHORT_DESCRIPTION),
(String) action.getValue(Action.LONG_DESCRIPTION),
action.getToolTipImage() == null ? null : new ImageIcon(action.getToolTipImage())
);
}
Expand Down

0 comments on commit 71d919d

Please sign in to comment.