git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into Release_2_8_2_Branch
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
5967f5f
..
590140b
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-559,7
+559,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
void showPasteMenu(int x, int y)
{
JPopupMenu popup = new JPopupMenu();
void showPasteMenu(int x, int y)
{
JPopupMenu popup = new JPopupMenu();
- JMenuItem item = new JMenuItem("Paste To New Window");
+ JMenuItem item = new JMenuItem(MessageManager.getString("label.paste_new_window"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent evt)
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent evt)
@@
-807,6
+807,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
*/
public void drop(DropTargetDropEvent evt)
{
*/
public void drop(DropTargetDropEvent evt)
{
+ boolean success=true;
Transferable t = evt.getTransferable();
java.util.List files = null;
java.util.List protocols = null;
Transferable t = evt.getTransferable();
java.util.List files = null;
java.util.List protocols = null;
@@
-855,6
+856,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
}
} catch (Exception e)
{
}
} catch (Exception e)
{
+ success=false;
}
if (files != null)
}
if (files != null)
@@
-883,8
+885,10
@@
public class Desktop extends jalview.jbgui.GDesktop implements
}
} catch (Exception ex)
{
}
} catch (Exception ex)
{
+ success=false;
}
}
}
}
+ evt.dropComplete(success); // need this to ensure input focus is properly transfered to any new windows created
}
/**
}
/**
@@
-902,8
+906,8
@@
public class Desktop extends jalview.jbgui.GDesktop implements
jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
chooser.setFileView(new JalviewFileView());
jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Open local file");
- chooser.setToolTipText("Open");
+ chooser.setDialogTitle(MessageManager.getString("label.open_local_file"));
+ chooser.setToolTipText(MessageManager.getString("action.open"));
int value = chooser.showOpenDialog(this);
int value = chooser.showOpenDialog(this);
@@
-914,7
+918,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
.getSelectedFile().getParent());
String format = null;
.getSelectedFile().getParent());
String format = null;
- if (chooser.getSelectedFormat().equals("Jalview"))
+ if (chooser.getSelectedFormat()!=null && chooser.getSelectedFormat().equals("Jalview"))
{
format = "Jalview";
}
{
format = "Jalview";
}
@@
-1511,6
+1515,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
{
if (progressPanel != null)
{
{
if (progressPanel != null)
{
+ synchronized(progressPanel) {
progressPanel.remove(progbar);
GridLayout gl = (GridLayout) progressPanel.getLayout();
gl.setRows(gl.getRows() - 1);
progressPanel.remove(progbar);
GridLayout gl = (GridLayout) progressPanel.getLayout();
gl.setRows(gl.getRows() - 1);
@@
-1519,6
+1524,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
this.getContentPane().remove(progressPanel);
progressPanel = null;
}
this.getContentPane().remove(progressPanel);
progressPanel = null;
}
+ }
}
validate();
}
}
validate();
}
@@
-1528,9
+1534,9
@@
public class Desktop extends jalview.jbgui.GDesktop implements
fileLoadingCount--;
if (fileLoadingCount < 1)
{
fileLoadingCount--;
if (fileLoadingCount < 1)
{
- for (JPanel flp : fileLoadingPanels)
+ while (fileLoadingPanels.size()>0)
{
{
- removeProgressPanel(flp);
+ removeProgressPanel(fileLoadingPanels.remove(0));
}
fileLoadingPanels.clear();
fileLoadingCount = 0;
}
fileLoadingPanels.clear();
fileLoadingCount = 0;
@@
-1713,7
+1719,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle("Open a saved VAMSAS session");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle("Open a saved VAMSAS session");
- chooser.setToolTipText("select a vamsas session to be opened as a new vamsas session.");
+ chooser.setToolTipText(MessageManager.getString("label.select_vamsas_session_opened_as_new_vamsas_session"));
int value = chooser.showOpenDialog(this);
int value = chooser.showOpenDialog(this);
@@
-1915,7
+1921,7
@@
public class Desktop extends jalview.jbgui.GDesktop implements
{
JMenuItem sessit = new JMenuItem();
sessit.setText(sess[i]);
{
JMenuItem sessit = new JMenuItem();
sessit.setText(sess[i]);
- sessit.setToolTipText("Connect to session " + sess[i]);
+ sessit.setToolTipText(MessageManager.formatMessage("label.connect_to_session", new String[]{sess[i]}));
final Desktop dsktp = this;
final String mysesid = sess[i];
sessit.addActionListener(new ActionListener()
final Desktop dsktp = this;
final String mysesid = sess[i];
sessit.addActionListener(new ActionListener()