X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fdemos%2FDemoApplication.java;h=3e4cbe92d56bcde373a7c6ec1d05e2327e86c0b1;hb=505be508ae7d3fb48122be548b310a238cfb91eb;hp=43bb709020c45a22777bf047128528ba94026133;hpb=42873e30bf487bc0b695d60652dba44f82185dbb;p=fanfix.git

diff --git a/src/jexer/demos/DemoApplication.java b/src/jexer/demos/DemoApplication.java
index 43bb709..3e4cbe9 100644
--- a/src/jexer/demos/DemoApplication.java
+++ b/src/jexer/demos/DemoApplication.java
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (C) 2017 Kevin Lamonte
+ * Copyright (C) 2019 Kevin Lamonte
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,12 +28,22 @@
  */
 package jexer.demos;
 
-import java.io.*;
-import java.util.*;
-
-import jexer.*;
-import jexer.event.*;
-import jexer.menu.*;
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.util.ResourceBundle;
+
+import jexer.TApplication;
+import jexer.TEditColorThemeWindow;
+import jexer.TEditorWindow;
+import jexer.event.TMenuEvent;
+import jexer.menu.TMenu;
+import jexer.menu.TMenuItem;
+import jexer.menu.TSubMenu;
 import jexer.backend.Backend;
 import jexer.backend.SwingTerminal;
 
@@ -43,47 +53,13 @@ import jexer.backend.SwingTerminal;
 public class DemoApplication extends TApplication {
 
     /**
-     * Add all the widgets of the demo.
+     * Translated strings.
      */
-    private void addAllWidgets() {
-        new DemoMainWindow(this);
-
-        // Add the menus
-        addFileMenu();
-        addEditMenu();
-
-        TMenu demoMenu = addMenu("&Demo");
-        TMenuItem item = demoMenu.addItem(2000, "&Checkable");
-        item.setCheckable(true);
-        item = demoMenu.addItem(2001, "Disabled");
-        item.setEnabled(false);
-        item = demoMenu.addItem(2002, "&Normal");
-        TSubMenu subMenu = demoMenu.addSubMenu("Sub-&Menu");
-        item = demoMenu.addItem(2010, "N&ormal A&&D");
-        item = demoMenu.addItem(2050, "Co&lors...");
-
-        item = subMenu.addItem(2000, "&Checkable (sub)");
-        item.setCheckable(true);
-        item = subMenu.addItem(2001, "Disabled (sub)");
-        item.setEnabled(false);
-        item = subMenu.addItem(2002, "&Normal (sub)");
-
-        subMenu = subMenu.addSubMenu("Sub-&Menu");
-        item = subMenu.addItem(2000, "&Checkable (sub)");
-        item.setCheckable(true);
-        item = subMenu.addItem(2001, "Disabled (sub)");
-        item.setEnabled(false);
-        item = subMenu.addItem(2002, "&Normal (sub)");
-
-        if (getScreen() instanceof SwingTerminal) {
-            TMenu swingMenu = addMenu("&Swing");
-            item = swingMenu.addItem(3000, "&Bigger +2");
-            item = swingMenu.addItem(3001, "&Smaller -2");
-        }
+    private static final ResourceBundle i18n = ResourceBundle.getBundle(DemoApplication.class.getName());
 
-        addWindowMenu();
-        addHelpMenu();
-    }
+    // ------------------------------------------------------------------------
+    // Constructors -----------------------------------------------------------
+    // ------------------------------------------------------------------------
 
     /**
      * Public constructor.
@@ -103,7 +79,7 @@ public class DemoApplication extends TApplication {
         super(input, output);
         addAllWidgets();
 
-        getBackend().setTitle("Jexer Demo Application");
+        getBackend().setTitle(i18n.getString("applicationTitle"));
     }
 
     /**
@@ -123,7 +99,7 @@ public class DemoApplication extends TApplication {
         super(input, reader, writer, setRawMode);
         addAllWidgets();
 
-        getBackend().setTitle("Jexer Demo Application");
+        getBackend().setTitle(i18n.getString("applicationTitle"));
     }
 
     /**
@@ -152,6 +128,25 @@ public class DemoApplication extends TApplication {
         addAllWidgets();
     }
 
+    /**
+     * Public constructor.
+     *
+     * @param backendType one of the TApplication.BackendType values
+     * @throws Exception if TApplication can't instantiate the Backend.
+     */
+    public DemoApplication(final BackendType backendType) throws Exception {
+        // For the Swing demo, use an initial size of 82x28 so that a
+        // terminal window precisely fits the window.
+        super(backendType, (backendType == BackendType.SWING ? 82 : -1),
+            (backendType == BackendType.SWING ? 28 : -1), 20);
+        addAllWidgets();
+        getBackend().setTitle(i18n.getString("applicationTitle"));
+    }
+
+    // ------------------------------------------------------------------------
+    // TApplication -----------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Handle menu events.
      *
@@ -187,20 +182,7 @@ public class DemoApplication extends TApplication {
                 String filename = fileOpenBox(".");
                  if (filename != null) {
                      try {
-                         File file = new File(filename);
-                         StringBuilder fileContents = new StringBuilder();
-                         Scanner scanner = new Scanner(file);
-                         String EOL = System.getProperty("line.separator");
-
-                         try {
-                             while (scanner.hasNextLine()) {
-                                 fileContents.append(scanner.nextLine() + EOL);
-                             }
-                             new DemoTextWindow(this, filename,
-                                 fileContents.toString());
-                         } finally {
-                             scanner.close();
-                         }
+                         new TEditorWindow(this, new File(filename));
                      } catch (IOException e) {
                          e.printStackTrace();
                      }
@@ -213,15 +195,53 @@ public class DemoApplication extends TApplication {
         return super.onMenu(menu);
     }
 
+    // ------------------------------------------------------------------------
+    // DemoApplication --------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
-     * Public constructor.
-     *
-     * @param backendType one of the TApplication.BackendType values
-     * @throws Exception if TApplication can't instantiate the Backend.
+     * Add all the widgets of the demo.
      */
-    public DemoApplication(final BackendType backendType) throws Exception {
-        super(backendType);
-        addAllWidgets();
-        getBackend().setTitle("Jexer Demo Application");
+    private void addAllWidgets() {
+        new DemoMainWindow(this);
+
+        // Add the menus
+        addToolMenu();
+        addFileMenu();
+        addEditMenu();
+
+        TMenu demoMenu = addMenu(i18n.getString("demo"));
+        TMenuItem item = demoMenu.addItem(2000, i18n.getString("checkable"));
+        item.setCheckable(true);
+        item = demoMenu.addItem(2001, i18n.getString("disabled"));
+        item.setEnabled(false);
+        item = demoMenu.addItem(2002, i18n.getString("normal"));
+        TSubMenu subMenu = demoMenu.addSubMenu(i18n.getString("subMenu"));
+        item = demoMenu.addItem(2010, i18n.getString("normal"));
+        item = demoMenu.addItem(2050, i18n.getString("colors"));
+
+        item = subMenu.addItem(2000, i18n.getString("checkableSub"));
+        item.setCheckable(true);
+        item = subMenu.addItem(2001, i18n.getString("disabledSub"));
+        item.setEnabled(false);
+        item = subMenu.addItem(2002, i18n.getString("normalSub"));
+
+        subMenu = subMenu.addSubMenu(i18n.getString("subMenu"));
+        item = subMenu.addItem(2000, i18n.getString("checkableSub"));
+        item.setCheckable(true);
+        item = subMenu.addItem(2001, i18n.getString("disabledSub"));
+        item.setEnabled(false);
+        item = subMenu.addItem(2002, i18n.getString("normalSub"));
+
+        if (getScreen() instanceof SwingTerminal) {
+            TMenu swingMenu = addMenu(i18n.getString("swing"));
+            item = swingMenu.addItem(3000, i18n.getString("bigger"));
+            item = swingMenu.addItem(3001, i18n.getString("smaller"));
+        }
+
+        addTableMenu();
+        addWindowMenu();
+        addHelpMenu();
     }
+
 }