git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
50050bb
)
JAL-3295 pre-merged code with JAL-3295 branch which will go onto develop
author
Ben Soares
<bsoares@dundee.ac.uk>
Fri, 14 Jun 2019 16:33:47 +0000
(17:33 +0100)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Fri, 14 Jun 2019 16:33:47 +0000
(17:33 +0100)
src/jalview/jbgui/GCutAndPasteHtmlTransfer.java
patch
|
blob
|
history
diff --git
a/src/jalview/jbgui/GCutAndPasteHtmlTransfer.java
b/src/jalview/jbgui/GCutAndPasteHtmlTransfer.java
index
3f0df21
..
1c9e907
100644
(file)
--- a/
src/jalview/jbgui/GCutAndPasteHtmlTransfer.java
+++ b/
src/jalview/jbgui/GCutAndPasteHtmlTransfer.java
@@
-22,7
+22,6
@@
package jalview.jbgui;
import jalview.gui.JvSwingUtils;
import jalview.util.MessageManager;
import jalview.gui.JvSwingUtils;
import jalview.util.MessageManager;
-import jalview.util.ShortcutKeyMaskExWrapper;
import java.awt.BorderLayout;
import java.awt.Font;
import java.awt.BorderLayout;
import java.awt.Font;
@@
-136,11
+135,15
@@
public class GCutAndPasteHtmlTransfer extends JInternalFrame
});
close.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
java.awt.event.KeyEvent.VK_W,
});
close.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
java.awt.event.KeyEvent.VK_W,
- ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx(), false));
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false));
selectAll.setText(MessageManager.getString("action.select_all"));
selectAll.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
java.awt.event.KeyEvent.VK_A,
selectAll.setText(MessageManager.getString("action.select_all"));
selectAll.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
java.awt.event.KeyEvent.VK_A,
- ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx(), false));
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false));
selectAll.addActionListener(new ActionListener()
{
@Override
selectAll.addActionListener(new ActionListener()
{
@Override
@@
-153,7
+156,9
@@
public class GCutAndPasteHtmlTransfer extends JInternalFrame
save.setText(MessageManager.getString("action.save"));
save.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
java.awt.event.KeyEvent.VK_S,
save.setText(MessageManager.getString("action.save"));
save.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
java.awt.event.KeyEvent.VK_S,
- ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx(), false));
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false));
save.addActionListener(new ActionListener()
{
@Override
save.addActionListener(new ActionListener()
{
@Override
@@
-164,7
+169,9
@@
public class GCutAndPasteHtmlTransfer extends JInternalFrame
});
copyItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
java.awt.event.KeyEvent.VK_C,
});
copyItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
java.awt.event.KeyEvent.VK_C,
- ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx(), false));
+ jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx(),
+ false));
editMenubar.add(jMenu1);
editMenubar.add(editMenu);
editMenubar.add(jMenu1);
editMenubar.add(editMenu);