Author: echatellier Date: 2015-06-10 13:14:55 +0000 (Wed, 10 Jun 2015) New Revision: 4257 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4257 Log: Fix label when no file is not displayed Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_en_GB.properties branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java 2015-06-10 12:52:23 UTC (rev 4256) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditor.java 2015-06-10 13:14:55 UTC (rev 4257) @@ -194,7 +194,6 @@ public boolean close() { boolean result = askAndSaveOrCancel(); - setText("Select a file to open"); setFile(null); return result; } Modified: branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java 2015-06-10 12:52:23 UTC (rev 4256) +++ branches/isis-fish-4.4.0-editor/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java 2015-06-10 13:14:55 UTC (rev 4257) @@ -33,6 +33,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; +import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.KeyStroke; import javax.swing.UIManager; @@ -70,6 +71,7 @@ protected RTextScrollPane textScrollpane; protected RSyntaxTextArea textArea; + protected JLabel noFileLabel; protected FindDialog findDialog; protected ReplaceDialog replaceDialog; @@ -86,8 +88,10 @@ textArea = new RSyntaxTextArea(); textScrollpane = new RTextScrollPane(textArea); - add(textScrollpane); + noFileLabel = new JLabel(t("isisfish.editor.noselectedfile"), JLabel.CENTER); + noFileLabel.setEnabled(false); + // for error/warning markers ErrorStrip errorStrip = new ErrorStrip(textArea); add(errorStrip, BorderLayout.LINE_END); @@ -103,6 +107,8 @@ textArea.setTabSize(4); initActions(); + + setEnabled(false); } protected void initActions() { @@ -167,11 +173,22 @@ @Override public void setEnabled(boolean enabled) { + if (enabled) { + remove(noFileLabel); + add(textScrollpane); + } else { + remove(textScrollpane); + add(noFileLabel); + } + // workarround for http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4286743 - textScrollpane.getHorizontalScrollBar().setEnabled(enabled); - textScrollpane.getVerticalScrollBar().setEnabled(enabled); - textScrollpane.getViewport().getView().setEnabled(enabled); - textScrollpane.setEnabled(enabled); + //textScrollpane.getHorizontalScrollBar().setEnabled(enabled); + //textScrollpane.getVerticalScrollBar().setEnabled(enabled); + //textScrollpane.getViewport().getView().setEnabled(enabled); + //textScrollpane.setEnabled(enabled); + + revalidate(); + repaint(); } private class GoToLineAction extends AbstractAction { Modified: branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-10 12:52:23 UTC (rev 4256) +++ branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_en_GB.properties 2015-06-10 13:14:55 UTC (rev 4257) @@ -253,6 +253,7 @@ isisfish.editor.cancel=Cancel isisfish.editor.copy=Copy isisfish.editor.cut=Cut +isisfish.editor.noselectedfile=No file selected \! isisfish.editor.parametersnameandtypes=Parameters (name and type) isisfish.editor.paste=Paste isisfish.editor.reload=Reload Modified: branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-10 12:52:23 UTC (rev 4256) +++ branches/isis-fish-4.4.0-editor/src/main/resources/i18n/isis-fish_fr_FR.properties 2015-06-10 13:14:55 UTC (rev 4257) @@ -253,6 +253,7 @@ isisfish.editor.cancel=Annuler isisfish.editor.copy=Copier isisfish.editor.cut=Couper +isisfish.editor.noselectedfile=Aucun fichier sélectionné \! isisfish.editor.parametersnameandtypes=Paramètres (nom et type) isisfish.editor.paste=Coller isisfish.editor.reload=Recharger