X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjexer%2Fdemos%2FDemo1.java;h=f8ede8578465370bd0348000bff37958ef7227ee;hb=7c870d89433346ccb5505f8f9ba62d3fc18fe996;hp=16138c556200b64af5deaa497c6771de70e62587;hpb=30bd4abd2a85c162bdf0a1cc687b366345182bc1;p=nikiroo-utils.git

diff --git a/src/jexer/demos/Demo1.java b/src/jexer/demos/Demo1.java
index 16138c5..f8ede85 100644
--- a/src/jexer/demos/Demo1.java
+++ b/src/jexer/demos/Demo1.java
@@ -351,9 +351,12 @@ class DemoMainWindow extends TWindow {
 
         addLabel("Variable-width text field:", 1, row);
         addField(35, row++, 15, false, "Field text");
-
         addLabel("Fixed-width text field:", 1, row);
-        addField(35, row, 15, true);
+        addField(35, row++, 15, true);
+        addLabel("Variable-width password:", 1, row);
+        addPasswordField(35, row++, 15, false);
+        addLabel("Fixed-width password:", 1, row);
+        addPasswordField(35, row++, 15, true, "hunter2");
         row += 2;
 
         if (!isModal()) {
@@ -402,32 +405,33 @@ class DemoMainWindow extends TWindow {
             );
         }
         row += 2;
+         */
 
         if (!isModal()) {
             addLabel("Terminal", 1, row);
             addButton("Termi&nal", 35, row,
-                {
-                    getApplication().openTerminal(0, 0);
+                new TAction() {
+                    public void DO() {
+                        getApplication().openTerminal(0, 0);
+                    }
                 }
             );
         }
         row += 2;
-         */
 
         progressBar = addProgressBar(1, row, 22, 0);
         row++;
         timerLabel = addLabel("Timer", 1, row);
-        timer = getApplication().addTimer(100, true,
+        timer = getApplication().addTimer(250, true,
             new TAction() {
 
                 public void DO() {
-                    timerLabel.setText(String.format("Timer: %d", timerI));
-                    timerLabel.setWidth(timerLabel.getText().length());
+                    timerLabel.setLabel(String.format("Timer: %d", timerI));
+                    timerLabel.setWidth(timerLabel.getLabel().length());
                     if (timerI < 100) {
                         timerI++;
                     }
                     progressBar.setValue(timerI);
-                    DemoMainWindow.this.setRepaint();
                 }
             }
         );
@@ -442,10 +446,11 @@ class DemoApplication extends TApplication {
     /**
      * Public constructor.
      *
+     * @param backendType one of the TApplication.BackendType values
      * @throws Exception if TApplication can't instantiate the Backend.
      */
-    public DemoApplication() throws Exception {
-        super(null, null);
+    public DemoApplication(BackendType backendType) throws Exception {
+        super(backendType);
         new DemoMainWindow(this);
 
         // Add the menus
@@ -490,8 +495,21 @@ public class Demo1 {
      */
     public static void main(final String [] args) {
         try {
-            DemoApplication app = new DemoApplication();
-            app.run();
+            // Swing is the default backend on Windows unless explicitly
+            // overridden by jexer.Swing.
+            TApplication.BackendType backendType = TApplication.BackendType.XTERM;
+            if (System.getProperty("os.name").startsWith("Windows")) {
+                backendType = TApplication.BackendType.SWING;
+            }
+            if (System.getProperty("jexer.Swing") != null) {
+                if (System.getProperty("jexer.Swing", "false").equals("true")) {
+                    backendType = TApplication.BackendType.SWING;
+                } else {
+                    backendType = TApplication.BackendType.XTERM;
+                }
+            }
+            DemoApplication app = new DemoApplication(backendType);
+            (new Thread(app)).start();
         } catch (Exception e) {
             e.printStackTrace();
         }