X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTFileOpenBox.java;h=6f46a034d6a70b394766460c71139ade0e293349;hb=d625990deaa2c24624adc9fbd3fcab58891f5aef;hp=a22483d8c9e8fc2810d04ea586c5b4ad92c5111e;hpb=e16dda65585466c8987bd1efd718431450a96605;p=fanfix.git diff --git a/src/jexer/TFileOpenBox.java b/src/jexer/TFileOpenBox.java index a22483d..6f46a03 100644 --- a/src/jexer/TFileOpenBox.java +++ b/src/jexer/TFileOpenBox.java @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (C) 2016 Kevin Lamonte + * Copyright (C) 2017 Kevin Lamonte * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -30,16 +30,19 @@ package jexer; import java.io.File; import java.io.IOException; +import java.util.ResourceBundle; import jexer.bits.GraphicsChars; import jexer.event.TKeypressEvent; +import jexer.ttree.TDirectoryTreeItem; +import jexer.ttree.TTreeItem; +import jexer.ttree.TTreeViewWidget; import static jexer.TKeypress.*; /** * TFileOpenBox is a system-modal dialog for selecting a file to open. Call * it like: * - *

*

  * {@code
  *     filename = application.fileOpenBox("/path/to/file.ext",
@@ -51,7 +54,16 @@ import static jexer.TKeypress.*;
  * 
* */ -public final class TFileOpenBox extends TWindow { +public class TFileOpenBox extends TWindow { + + /** + * Translated strings. + */ + private static final ResourceBundle i18n = ResourceBundle.getBundle(TFileOpenBox.class.getName()); + + // ------------------------------------------------------------------------ + // Constants -------------------------------------------------------------- + // ------------------------------------------------------------------------ /** * TFileOpenBox can be called for either Open or Save actions. @@ -68,24 +80,19 @@ public final class TFileOpenBox extends TWindow { SAVE } + // ------------------------------------------------------------------------ + // Variables -------------------------------------------------------------- + // ------------------------------------------------------------------------ + /** * String to return, or null if the user canceled. */ private String filename = null; - /** - * Get the return string. - * - * @return the filename the user selected, or null if they canceled. - */ - public String getFilename() { - return filename; - } - /** * The left-side tree view pane. */ - private TTreeView treeView; + private TTreeViewWidget treeView; /** * The data behind treeView. @@ -107,31 +114,9 @@ public final class TFileOpenBox extends TWindow { */ private TButton openButton; - /** - * See if there is a valid filename to return. If the filename is a - * directory, then - * - * @param newFilename the filename to check and return - * @throws IOException of a java.io operation throws - */ - private void checkFilename(final String newFilename) throws IOException { - File newFile = new File(newFilename); - if (newFile.exists()) { - if (newFile.isFile()) { - filename = newFilename; - getApplication().closeWindow(this); - return; - } - if (newFile.isDirectory()) { - treeViewRoot = new TDirectoryTreeItem(treeView, newFilename, - true); - treeView.setTreeRoot(treeViewRoot, true); - treeView.reflow(); - openButton.setEnabled(false); - directoryList.setPath(newFilename); - } - } - } + // ------------------------------------------------------------------------ + // Constructors ----------------------------------------------------------- + // ------------------------------------------------------------------------ /** * Public constructor. The file open box will be centered on screen. @@ -162,7 +147,7 @@ public final class TFileOpenBox extends TWindow { entryField.onKeypress(new TKeypressEvent(kbEnd)); // Add directory treeView - treeView = addTreeView(1, 3, 30, getHeight() - 6, + treeView = addTreeViewWidget(1, 3, 30, getHeight() - 6, new TAction() { public void DO() { TTreeItem item = treeView.getSelected(); @@ -170,7 +155,7 @@ public final class TFileOpenBox extends TWindow { try { directoryList.setPath(selectedDir.getCanonicalPath()); openButton.setEnabled(false); - activate(directoryList); + activate(treeView); } catch (IOException e) { e.printStackTrace(); } @@ -199,12 +184,12 @@ public final class TFileOpenBox extends TWindow { String openLabel = ""; switch (type) { case OPEN: - openLabel = " &Open "; - setTitle("Open File..."); + openLabel = i18n.getString("openButton"); + setTitle(i18n.getString("openTitle")); break; case SAVE: - openLabel = " &Save "; - setTitle("Save File..."); + openLabel = i18n.getString("saveButton"); + setTitle(i18n.getString("saveTitle")); break; default: throw new IllegalArgumentException("Invalid type: " + type); @@ -224,7 +209,7 @@ public final class TFileOpenBox extends TWindow { ); openButton.setEnabled(false); - addButton("&Cancel", getWidth() - 12, 5, + addButton(i18n.getString("cancelButton"), getWidth() - 12, 5, new TAction() { public void DO() { filename = null; @@ -244,15 +229,9 @@ public final class TFileOpenBox extends TWindow { getApplication().yield(); } - /** - * Draw me on screen. - */ - @Override - public void draw() { - super.draw(); - getScreen().vLineXY(33, 4, getHeight() - 6, GraphicsChars.WINDOW_SIDE, - getBackground()); - } + // ------------------------------------------------------------------------ + // Event handlers --------------------------------------------------------- + // ------------------------------------------------------------------------ /** * Handle keystrokes. @@ -269,8 +248,86 @@ public final class TFileOpenBox extends TWindow { return; } + if (treeView.isActive()) { + if ((keypress.equals(kbEnter)) + || (keypress.equals(kbUp)) + || (keypress.equals(kbDown)) + || (keypress.equals(kbPgUp)) + || (keypress.equals(kbPgDn)) + || (keypress.equals(kbHome)) + || (keypress.equals(kbEnd)) + ) { + // Tree view will be changing, update the directory list. + super.onKeypress(keypress); + + // This is the same action as treeView's enter. + TTreeItem item = treeView.getSelected(); + File selectedDir = ((TDirectoryTreeItem) item).getFile(); + try { + directoryList.setPath(selectedDir.getCanonicalPath()); + openButton.setEnabled(false); + activate(treeView); + } catch (IOException e) { + e.printStackTrace(); + } + return; + } + } + // Pass to my parent super.onKeypress(keypress); } + // ------------------------------------------------------------------------ + // TWidget ---------------------------------------------------------------- + // ------------------------------------------------------------------------ + + /** + * Draw me on screen. + */ + @Override + public void draw() { + super.draw(); + getScreen().vLineXY(33, 4, getHeight() - 6, GraphicsChars.WINDOW_SIDE, + getBackground()); + } + + // ------------------------------------------------------------------------ + // TFileOpenBox ----------------------------------------------------------- + // ------------------------------------------------------------------------ + + /** + * Get the return string. + * + * @return the filename the user selected, or null if they canceled. + */ + public String getFilename() { + return filename; + } + + /** + * See if there is a valid filename to return. If the filename is a + * directory, then + * + * @param newFilename the filename to check and return + * @throws IOException of a java.io operation throws + */ + private void checkFilename(final String newFilename) throws IOException { + File newFile = new File(newFilename); + if (newFile.exists()) { + if (newFile.isFile()) { + filename = newFilename; + getApplication().closeWindow(this); + return; + } + if (newFile.isDirectory()) { + treeViewRoot = new TDirectoryTreeItem(treeView, + newFilename, true); + treeView.setTreeRoot(treeViewRoot, true); + openButton.setEnabled(false); + directoryList.setPath(newFilename); + } + } + } + }