X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2FMain.java;h=6f12a2b7dba4c161daa1f6a029ea89c070ee9522;hb=e253bd50bb05519f4a16fed4fb95d5b3340128ea;hp=a0357bec89e4c0a59ee19899d0d8bbb32cd9723d;hpb=668268fc236425a7be575417cd0d3810c29127a1;p=jvcard.git
diff --git a/src/be/nikiroo/jvcard/tui/Main.java b/src/be/nikiroo/jvcard/tui/Main.java
index a0357be..6f12a2b 100644
--- a/src/be/nikiroo/jvcard/tui/Main.java
+++ b/src/be/nikiroo/jvcard/tui/Main.java
@@ -2,25 +2,18 @@ package be.nikiroo.jvcard.tui;
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
import java.util.LinkedList;
import java.util.List;
import be.nikiroo.jvcard.i18n.Trans;
import be.nikiroo.jvcard.i18n.Trans.StringId;
+import be.nikiroo.jvcard.resources.Bundles;
import be.nikiroo.jvcard.tui.panes.FileList;
-import com.googlecode.lanterna.TextColor;
-import com.googlecode.lanterna.gui2.BasicWindow;
-import com.googlecode.lanterna.gui2.DefaultWindowManager;
-import com.googlecode.lanterna.gui2.EmptySpace;
-import com.googlecode.lanterna.gui2.MultiWindowTextGUI;
import com.googlecode.lanterna.gui2.Window;
-import com.googlecode.lanterna.gui2.table.Table;
import com.googlecode.lanterna.input.KeyStroke;
-import com.googlecode.lanterna.screen.Screen;
-import com.googlecode.lanterna.screen.TerminalScreen;
-import com.googlecode.lanterna.terminal.DefaultTerminalFactory;
-import com.googlecode.lanterna.terminal.Terminal;
/**
* This class contains the runnable Main method. It will parse the user supplied
@@ -32,7 +25,7 @@ import com.googlecode.lanterna.terminal.Terminal;
*/
public class Main {
public static final String APPLICATION_TITLE = "jVcard";
- public static final String APPLICATION_VERSION = "1.0-beta1-dev";
+ public static final String APPLICATION_VERSION = "1.0-beta2-dev";
static private Trans transService;
@@ -45,7 +38,6 @@ public class Main {
* @return the translation
*/
static public String trans(StringId id) {
-
if (transService == null)
return "";
@@ -71,7 +63,8 @@ public class Main {
* Start the application.
*
* @param args
- * the parameters (see --help to know hich are supported)
+ * the parameters (see --help to know which are
+ * supported)
*/
public static void main(String[] args) {
Boolean textMode = null;
@@ -81,9 +74,9 @@ public class Main {
// get the "system default" language to help translate the --help
// message if needed
String language = null;
- transService = new Trans(null);
+ transService = new Trans(language);
- List files = new LinkedList();
+ List files = new LinkedList();
for (int index = 0; index < args.length; index++) {
String arg = args[index];
if (!noMoreParams && arg.equals("--")) {
@@ -98,9 +91,9 @@ public class Main {
+ "\t--tui: force pure text mode even if swing treminal is available\n"
+ "\t--gui: force swing terminal mode\n"
+ "\t--noutf: force non-utf8 mode if you need it\n"
- + "\t--noutfa: force non-utf8 and no accents mode if you need it\n"
+ + "\t--config DIRECTORY: force the given directory as a CONFIG_DIR\n"
+ "everyhing else is either a file to open or a directory to open\n"
- + "(we will only open 1st level files in given directories)");
+ + "(we will only open 1st level files in given directories)\n");
return;
} else if (!noMoreParams && arg.equals("--tui")) {
textMode = true;
@@ -113,12 +106,22 @@ public class Main {
if (index < args.length)
language = args[index];
transService = new Trans(language);
+ } else if (!noMoreParams && arg.equals("--config")) {
+ index++;
+ if (index < args.length) {
+ Bundles.setDirectory(args[index]);
+ transService = new Trans(language);
+ }
} else {
filesTried = true;
files.addAll(open(arg));
}
}
+ if (UiColors.getInstance().isUnicode()) {
+ utf8();
+ }
+
if (files.size() == 0) {
if (filesTried) {
System.exit(1);
@@ -147,18 +150,18 @@ public class Main {
*
* @return the list of opened files
*/
- static private List open(String path) {
- List files = new LinkedList();
+ static private List open(String path) {
+ List files = new LinkedList();
File file = new File(path);
if (file.exists()) {
if (file.isDirectory()) {
for (File subfile : file.listFiles()) {
if (!subfile.isDirectory())
- files.add(subfile);
+ files.add(subfile.getAbsolutePath());
}
} else {
- files.add(file);
+ files.add(file.getAbsolutePath());
}
} else {
System.err.println("File or directory not found: \"" + path + "\"");
@@ -167,35 +170,19 @@ public class Main {
return files;
}
- static private void fullTestTable() throws IOException {
- final Table table = new Table("Column 1", "Column 2",
- "Column 3");
- table.getTableModel().addRow("1", "2", "3");
- table.setSelectAction(new Runnable() {
- @Override
- public void run() {
- List data = table.getTableModel().getRow(
- table.getSelectedRow());
- for (int i = 0; i < data.size(); i++) {
- System.out.println(data.get(i));
- }
- }
- });
-
- Window win = new BasicWindow();
- win.setComponent(table);
-
- DefaultTerminalFactory factory = new DefaultTerminalFactory();
- Terminal terminal = factory.createTerminal();
-
- Screen screen = new TerminalScreen(terminal);
- screen.startScreen();
-
- // Create gui and start gui
- MultiWindowTextGUI gui = new MultiWindowTextGUI(screen,
- new DefaultWindowManager(), new EmptySpace(TextColor.ANSI.BLUE));
- gui.addWindowAndWait(win);
-
- screen.stopScreen();
+ /**
+ * Really, really ask for UTF-8 encoding.
+ */
+ static private void utf8() {
+ try {
+ System.setProperty("file.encoding", "UTF-8");
+ Field charset = Charset.class.getDeclaredField("defaultCharset");
+ charset.setAccessible(true);
+ charset.set(null, null);
+ } catch (SecurityException e) {
+ } catch (NoSuchFieldException e) {
+ } catch (IllegalArgumentException e) {
+ } catch (IllegalAccessException e) {
+ }
}
}