X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTEditColorThemeWindow.java;h=a13bf1444f439d6043a65c2cffaf5de69a61bd9f;hb=1b1206070bb94d706c14400b8332a81646b77a25;hp=d46ef54998ba15d388d23488863c02e6ef86bc88;hpb=3649b9210ea425f398ba8c24f9509669cf72aa96;p=fanfix.git diff --git a/src/jexer/TEditColorThemeWindow.java b/src/jexer/TEditColorThemeWindow.java index d46ef54..a13bf14 100644 --- a/src/jexer/TEditColorThemeWindow.java +++ b/src/jexer/TEditColorThemeWindow.java @@ -1,29 +1,27 @@ /* * Jexer - Java Text User Interface * - * License: LGPLv3 or later + * The MIT License (MIT) * - * This module is licensed under the GNU Lesser General Public License - * Version 3. Please see the file "COPYING" in this directory for more - * information about the GNU Lesser General Public License Version 3. + * Copyright (C) 2017 Kevin Lamonte * - * Copyright (C) 2015 Kevin Lamonte + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 3 of - * the License, or (at your option) any later version. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see - * http://www.gnu.org/licenses/, or write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * @author Kevin Lamonte [kevin.lamonte@gmail.com] * @version 1 @@ -204,41 +202,40 @@ public final class TEditColorThemeWindow extends TWindow { // 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); @@ -250,7 +247,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); } } @@ -476,23 +475,22 @@ public final class TEditColorThemeWindow extends TWindow { // 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); @@ -504,7 +502,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); } } @@ -708,6 +707,8 @@ public final class TEditColorThemeWindow extends TWindow { // Default to the color list activate(colorNames); + // Add shortcut text + newStatusBar("Select Colors"); } /**