diff options
| author | David A. Madore <david+git@madore.org> | 2019-05-04 15:41:04 +0200 |
|---|---|---|
| committer | David A. Madore <david+git@madore.org> | 2019-05-04 16:12:04 +0200 |
| commit | a715d6c4332065d0e72708b46507ee965c1fe1e1 (patch) | |
| tree | 2edfc166b15ef0a0f645f2132475e2136aa80bed /org/madore/damlengine | |
| parent | da483e0f6b1ee11c55ba66882c1baeeb2bab881e (diff) | |
| download | damlengine-a715d6c4332065d0e72708b46507ee965c1fe1e1.tar.gz damlengine-a715d6c4332065d0e72708b46507ee965c1fe1e1.tar.bz2 damlengine-a715d6c4332065d0e72708b46507ee965c1fe1e1.zip | |
Rationalize smileys somewhat.
Diffstat (limited to 'org/madore/damlengine')
| -rw-r--r-- | org/madore/damlengine/TodoElement.java | 2 | ||||
| -rw-r--r-- | org/madore/damlengine/TodoSmileyElement.java | 24 | ||||
| -rw-r--r-- | org/madore/damlengine/images/smileys/evilgrin.png (renamed from org/madore/damlengine/images/smileys/twisted.png) | bin | 267 -> 267 bytes |
3 files changed, 19 insertions, 7 deletions
diff --git a/org/madore/damlengine/TodoElement.java b/org/madore/damlengine/TodoElement.java index acccac0..0cc7880 100644 --- a/org/madore/damlengine/TodoElement.java +++ b/org/madore/damlengine/TodoElement.java @@ -57,7 +57,7 @@ public abstract class TodoElement extends TodoItem { damlFactories.put("smiley-confused", new TodoSmileyElement.Factory(TodoSmileyElement.Type.CONFUSED)); damlFactories.put("smiley-crazy", new TodoSmileyElement.Factory(TodoSmileyElement.Type.CRAZY)); damlFactories.put("smiley-neutral", new TodoSmileyElement.Factory(TodoSmileyElement.Type.NEUTRAL)); - damlFactories.put("smiley-twisted", new TodoSmileyElement.Factory(TodoSmileyElement.Type.TWISTED)); + damlFactories.put("smiley-evilgrin", new TodoSmileyElement.Factory(TodoSmileyElement.Type.EVILGRIN)); damlFactories.put("smiley-cry", new TodoSmileyElement.Factory(TodoSmileyElement.Type.CRY)); damlFactories.put("smiley-evil", new TodoSmileyElement.Factory(TodoSmileyElement.Type.EVIL)); damlFactories.put("img-a", new TodoImgAElement.Factory()); diff --git a/org/madore/damlengine/TodoSmileyElement.java b/org/madore/damlengine/TodoSmileyElement.java index 8bd3031..4e79f4d 100644 --- a/org/madore/damlengine/TodoSmileyElement.java +++ b/org/madore/damlengine/TodoSmileyElement.java @@ -5,18 +5,30 @@ import org.w3c.dom.*; public final class TodoSmileyElement extends TodoDefaultElement { public enum Type { - SMILE("smile", new String(Character.toChars(0x263A)), "Smile", "Sourire"), + // Originally :-) + SMILE("smile", "\u263A\uFE0F", "Smile", "Sourire"), + // Originally ;-) WINK("wink", new String(Character.toChars(0x1F609)), "Wink", "Clin d'\u0153il"), + // Originally :-o SURPRISED("surprised", new String(Character.toChars(0x1F632)), "Surprised", "Surpris"), - SAD("sad", new String(Character.toChars(0x2639)), "Sad", "Triste"), + // Originally :-( + SAD("sad", "\u2639\uFE0F", "Sad", "Triste"), + // Originally 8-) COOL("cool", new String(Character.toChars(0x1F60E)), "Cool", "Cool"), + // Originally :-D BIGGRIN("biggrin", new String(Character.toChars(0x1F601)), "Big grin", "Grand sourire"), - CONFUSED("confused", new String(Character.toChars(0x1F615)), "Confused", "Troubl\u00e9"), - CRAZY("crazy", new String(Character.toChars(0x1F61D)), "Crazy", "Fou"), + // Originally :-S + CONFUSED("confused", new String(Character.toChars(0x1F615)), "Confused", "Embrouill\u00e9"), + // Originally %-) + CRAZY("crazy", new String(Character.toChars(0x1F92A)), "Crazy", "Fou"), + // Originally :-| NEUTRAL("neutral", new String(Character.toChars(0x1F610)), "Non-grin", "Sans sourire"), - TWISTED("twisted", new String(Character.toChars(0x1F621)), "Twisted", "Tordu"), + // Formerly "twisted", originally 8-> now thought of as >:-) + EVILGRIN("evilgrin", new String(Character.toChars(0x1F608)), "Evil grin", "Sourire mauvais"), + // Originally \u00A6-( CRY("cry", new String(Character.toChars(0x1F622)), "Crying", "Pleure"), - EVIL("evil", new String(Character.toChars(0x1F608)), "Evil", "Mauvais"); + // Originally >:-( + EVIL("evil", new String(Character.toChars(0x1F47F)), "Evil", "Mauvais"); final String emotion; final String altText; final String enName; diff --git a/org/madore/damlengine/images/smileys/twisted.png b/org/madore/damlengine/images/smileys/evilgrin.png Binary files differindex 5f6eed1..5f6eed1 100644 --- a/org/madore/damlengine/images/smileys/twisted.png +++ b/org/madore/damlengine/images/smileys/evilgrin.png |
