Compare commits

..

No commits in common. "dev" and "master" have entirely different histories.
dev ... master

7 changed files with 8 additions and 91 deletions

View File

@ -1,39 +0,0 @@
package fr.uha.gabalier.util.languages;
import java.beans.Beans;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
public class StringSources {
////////////////////////////////////////////////////////////////////////////
//
// Constructor
//
////////////////////////////////////////////////////////////////////////////
private StringSources() {
// do not instantiate
}
////////////////////////////////////////////////////////////////////////////
//
// Bundle access
//
////////////////////////////////////////////////////////////////////////////
private static final String BUNDLE_NAME = "fr.uha.gabalier.util.languages.stringsources"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = loadBundle();
private static ResourceBundle loadBundle() {
return ResourceBundle.getBundle(BUNDLE_NAME);
}
////////////////////////////////////////////////////////////////////////////
//
// Strings access
//
////////////////////////////////////////////////////////////////////////////
public static String getString(String key) {
try {
ResourceBundle bundle = Beans.isDesignTime() ? loadBundle() : RESOURCE_BUNDLE;
return bundle.getString(key);
} catch (MissingResourceException e) {
return "!" + key + "!";
}
}
}

View File

@ -1,9 +0,0 @@
#Eclipse messages class
#Thu Sep 27 17:27:39 CEST 2018
Preview.cancelItem.text=Cancel
Preview.exitItem.text=Exit
Preview.fileMenu.text=File
Preview.loadItem.text=Load
Preview.other.text=status \:
Preview.statusText.text=0000 images loaded
Preview.this.title=Image Loader

View File

@ -1,9 +0,0 @@
#Eclipse messages class
#Thu Sep 27 17:27:39 CEST 2018
Preview.cancelItem.text=Cancel
Preview.exitItem.text=Exit
Preview.fileMenu.text=File
Preview.loadItem.text=Load
Preview.other.text=status \:
Preview.statusText.text=0000 images loaded
Preview.this.title=Image Loader

View File

@ -1,9 +0,0 @@
#Eclipse messages class
#Thu Sep 27 17:27:40 CEST 2018
Preview.cancelItem.text=Cancelar
Preview.exitItem.text=Salir
Preview.fileMenu.text=Archivo
Preview.loadItem.text=Carga
Preview.other.text=Estatus \:
Preview.statusText.text=0000 im\u00E1genes cargadas
Preview.this.title=Cargador de im\u00E1genes

View File

@ -1,9 +0,0 @@
#Eclipse messages class
#Thu Sep 27 17:27:39 CEST 2018
Preview.cancelItem.text=Annuler
Preview.exitItem.text=Quitter
Preview.fileMenu.text=Fichier
Preview.loadItem.text=Charger
Preview.other.text=Status \:
Preview.statusText.text=0000 images charg\u00E9es
Preview.this.title=Visionneuse d'image

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -9,12 +9,9 @@ import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.List;
import fr.uha.gabalier.util.languages.StringSources;
public class Preview extends JFrame {
private static final long serialVersionUID = -8104236322964434859L;
static final int VIEW_WIDTH = 256;
static final int VIEW_HEIGHT = 128;
@ -34,30 +31,25 @@ public class Preview extends JFrame {
private final JTextField statusText;
public Preview() throws HeadlessException {
setIconImage(Toolkit.getDefaultToolkit().getImage(Preview.class.getResource("/fr/uha/gabalier/util/ressources/logo.jpg")));
setTitle(StringSources.getString("Preview.this.title")); //$NON-NLS-1$
model = new ArrayList<>();
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
// UI elements
JMenuBar menuBar = new JMenuBar();
setJMenuBar(menuBar);
JMenu fileMenu = new JMenu(StringSources.getString("Preview.fileMenu.text")); //$NON-NLS-1$
JMenu fileMenu = new JMenu("File");
menuBar.add(fileMenu);
loadItem = new JMenuItem(StringSources.getString("Preview.loadItem.text")); //$NON-NLS-1$
loadItem = new JMenuItem("Load");
fileMenu.add(loadItem);
loadItem.addActionListener(actionEvent -> doLoad());
cancelItem = new JMenuItem(StringSources.getString("Preview.cancelItem.text")); //$NON-NLS-1$
cancelItem = new JMenuItem("Cancel");
fileMenu.add(cancelItem);
cancelItem.addActionListener(actionEvent -> doCancel());
final JMenuItem exitItem = new JMenuItem(StringSources.getString("Preview.exitItem.text")); //$NON-NLS-1$
final JMenuItem exitItem = new JMenuItem("Exit");
exitItem.addActionListener(actionEvent -> doExit());
exitItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, InputEvent.CTRL_DOWN_MASK));
fileMenu.add(exitItem);
getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
imageView = new ImageView(model);
final ImageController controller = new ImageController(model);
@ -76,8 +68,8 @@ public class Preview extends JFrame {
final JPanel statusPanel = new JPanel();
getContentPane().add(statusPanel);
statusText = new JTextField(StringSources.getString("Preview.statusText.text")); //$NON-NLS-1$
statusPanel.add(new JLabel(StringSources.getString("Preview.other.text"))); //$NON-NLS-1$
statusText = new JTextField("0000 images loaded");
statusPanel.add(new JLabel("status :"));
statusPanel.add(statusText);
pack();