X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTEditColorThemeWindow.java;h=5b4abf39f467a80ecfaf4203cdfcb5bfd53cbffe;hb=eb29bbb5ec70c43895dd0f053630c7e3cd402cba;hp=e06d331dfd9b1be13969cb0636440efe187f40ae;hpb=e16dda65585466c8987bd1efd718431450a96605;p=nikiroo-utils.git

diff --git a/src/jexer/TEditColorThemeWindow.java b/src/jexer/TEditColorThemeWindow.java
index e06d331..5b4abf3 100644
--- a/src/jexer/TEditColorThemeWindow.java
+++ b/src/jexer/TEditColorThemeWindow.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"),
@@ -29,6 +29,7 @@
 package jexer;
 
 import java.util.List;
+import java.util.ResourceBundle;
 
 import jexer.bits.Color;
 import jexer.bits.ColorTheme;
@@ -43,7 +44,12 @@ import static jexer.TKeypress.*;
  * color theme.
  *
  */
-public final class TEditColorThemeWindow extends TWindow {
+public class TEditColorThemeWindow extends TWindow {
+
+    /**
+     * Translated strings.
+     */
+    private static final ResourceBundle i18n = ResourceBundle.getBundle(TEditColorThemeWindow.class.getName());
 
     /**
      * The foreground color picker.
@@ -197,46 +203,46 @@ public final class TEditColorThemeWindow extends TWindow {
                 attr.setForeColor(getTheme().getColor("tlabel").getForeColor());
                 attr.setBold(getTheme().getColor("tlabel").isBold());
             }
-            getScreen().putStringXY(1, 0, " Foreground ", attr);
+            getScreen().putStringXY(1, 0, i18n.getString("foregroundLabel"),
+                attr);
 
             // Have to draw the colors manually because the int value matches
             // SGR, not CGA.
             attr.reset();
-            attr.setReverse(true);
             attr.setForeColor(Color.BLACK);
-            putStringXY(1, 1, "   ", attr);
+            putStringXY(1, 1, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.BLUE);
-            putStringXY(4, 1, "   ", attr);
+            putStringXY(4, 1, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.GREEN);
-            putStringXY(7, 1, "   ", attr);
+            putStringXY(7, 1, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.CYAN);
-            putStringXY(10, 1, "   ", attr);
+            putStringXY(10, 1, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.RED);
-            putStringXY(1, 2, "   ", attr);
+            putStringXY(1, 2, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.MAGENTA);
-            putStringXY(4, 2, "   ", attr);
+            putStringXY(4, 2, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.YELLOW);
-            putStringXY(7, 2, "   ", attr);
+            putStringXY(7, 2, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.WHITE);
-            putStringXY(10, 2, "   ", attr);
+            putStringXY(10, 2, "\u2588\u2588\u2588", attr);
 
             attr.setBold(true);
             attr.setForeColor(Color.BLACK);
-            putStringXY(1, 3, "   ", attr);
+            putStringXY(1, 3, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.BLUE);
-            putStringXY(4, 3, "   ", attr);
+            putStringXY(4, 3, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.GREEN);
-            putStringXY(7, 3, "   ", attr);
+            putStringXY(7, 3, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.CYAN);
-            putStringXY(10, 3, "   ", attr);
+            putStringXY(10, 3, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.RED);
-            putStringXY(1, 4, "   ", attr);
+            putStringXY(1, 4, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.MAGENTA);
-            putStringXY(4, 4, "   ", attr);
+            putStringXY(4, 4, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.YELLOW);
-            putStringXY(7, 4, "   ", attr);
+            putStringXY(7, 4, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.WHITE);
-            putStringXY(10, 4, "   ", attr);
+            putStringXY(10, 4, "\u2588\u2588\u2588", attr);
 
             // Draw the dot
             int dotX = getXColorPosition(color);
@@ -248,7 +254,9 @@ public final class TEditColorThemeWindow extends TWindow {
                 getScreen().putCharXY(dotX, dotY, GraphicsChars.CP437[0x07],
                     attr);
             } else {
-                getScreen().putCharXY(dotX, dotY, GraphicsChars.CP437[0x07]);
+                attr.setForeColor(color);
+                attr.setBold(bold);
+                getScreen().putCharXY(dotX, dotY, '\u25D8', attr);
             }
         }
 
@@ -469,28 +477,28 @@ public final class TEditColorThemeWindow extends TWindow {
                 attr.setForeColor(getTheme().getColor("tlabel").getForeColor());
                 attr.setBold(getTheme().getColor("tlabel").isBold());
             }
-            getScreen().putStringXY(1, 0, " Background ", attr);
+            getScreen().putStringXY(1, 0, i18n.getString("backgroundLabel"),
+                attr);
 
             // Have to draw the colors manually because the int value matches
             // SGR, not CGA.
             attr.reset();
-            attr.setReverse(true);
             attr.setForeColor(Color.BLACK);
-            putStringXY(1, 1, "   ", attr);
+            putStringXY(1, 1, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.BLUE);
-            putStringXY(4, 1, "   ", attr);
+            putStringXY(4, 1, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.GREEN);
-            putStringXY(7, 1, "   ", attr);
+            putStringXY(7, 1, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.CYAN);
-            putStringXY(10, 1, "   ", attr);
+            putStringXY(10, 1, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.RED);
-            putStringXY(1, 2, "   ", attr);
+            putStringXY(1, 2, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.MAGENTA);
-            putStringXY(4, 2, "   ", attr);
+            putStringXY(4, 2, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.YELLOW);
-            putStringXY(7, 2, "   ", attr);
+            putStringXY(7, 2, "\u2588\u2588\u2588", attr);
             attr.setForeColor(Color.WHITE);
-            putStringXY(10, 2, "   ", attr);
+            putStringXY(10, 2, "\u2588\u2588\u2588", attr);
 
             // Draw the dot
             int dotX = getXColorPosition(color);
@@ -502,7 +510,8 @@ public final class TEditColorThemeWindow extends TWindow {
                 getScreen().putCharXY(dotX, dotY, GraphicsChars.CP437[0x07],
                     attr);
             } else {
-                getScreen().putCharXY(dotX, dotY, GraphicsChars.CP437[0x07]);
+                attr.setForeColor(color);
+                getScreen().putCharXY(dotX, dotY, '\u25D8', attr);
             }
 
         }
@@ -649,7 +658,7 @@ public final class TEditColorThemeWindow extends TWindow {
     public TEditColorThemeWindow(final TApplication application) {
 
         // Register with the TApplication
-        super(application, "Colors", 0, 0, 60, 18, MODAL);
+        super(application, i18n.getString("windowTitle"), 0, 0, 60, 18, MODAL);
 
         // Initialize with the first color
         List<String> colors = getTheme().getColorNames();
@@ -680,7 +689,7 @@ public final class TEditColorThemeWindow extends TWindow {
         refreshFromTheme(colors.get(0));
         colorNames.setSelectedIndex(0);
 
-        addButton("  &OK  ", getWidth() - 37, getHeight() - 4,
+        addButton(i18n.getString("okButton"), getWidth() - 37, getHeight() - 4,
             new TAction() {
                 public void DO() {
                     ColorTheme global = getTheme();
@@ -695,7 +704,8 @@ public final class TEditColorThemeWindow extends TWindow {
             }
         );
 
-        addButton("&Cancel", getWidth() - 25, getHeight() - 4,
+        addButton(i18n.getString("cancelButton"), getWidth() - 25,
+            getHeight() - 4,
             new TAction() {
                 public void DO() {
                     getApplication().closeWindow(TEditColorThemeWindow.this);
@@ -706,6 +716,8 @@ public final class TEditColorThemeWindow extends TWindow {
         // Default to the color list
         activate(colorNames);
 
+        // Add shortcut text
+        newStatusBar(i18n.getString("statusBar"));
     }
 
     /**
@@ -722,7 +734,7 @@ public final class TEditColorThemeWindow extends TWindow {
             attr.setForeColor(getTheme().getColor("tlabel").getForeColor());
             attr.setBold(getTheme().getColor("tlabel").isBold());
         }
-        getScreen().putStringXY(3, 2, "Color Name", attr);
+        getScreen().putStringXY(3, 2, i18n.getString("colorName"), attr);
 
         // Draw the sample text box
         attr.reset();
@@ -730,9 +742,9 @@ public final class TEditColorThemeWindow extends TWindow {
         attr.setBold(foreground.bold);
         attr.setBackColor(background.color);
         getScreen().putStringXY(getWidth() - 17, getHeight() - 6,
-            "Text Text Text", attr);
+            i18n.getString("textTextText"), attr);
         getScreen().putStringXY(getWidth() - 17, getHeight() - 5,
-            "Text Text Text", attr);
+            i18n.getString("textTextText"), attr);
     }
 
     /**