mirror
/
DMDirc-Client
spegling av https://github.com/DMDirc/DMDirc.git
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Släpp 49 Wiki Aktiviteter
Bläddra i källkod

Merge smilie branch 

Issue 1756
Fixes issue 3976

Change-Id: Ic79d0b15dc21b73d7e67e3352b4d1bd993bcfbda
Reviewed-on: http://gerrit.dmdirc.com/1079
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
tags/0.6.4rc1
Chris Smith 14 år sedan
förälder
c93cb54903
incheckning
8b2d4eac9b
11 ändrade filer med 538 tillägg och 4 borttagningar
Delad Vy Visa Diff Statistik
  1. Binär
      src/com/dmdirc/res/smilies/yellow/neutral.png
  2. Binär
      src/com/dmdirc/res/smilies/yellow/sad.png
  3. Binär
      src/com/dmdirc/res/smilies/yellow/smile.png
  4. 103
    0
      src/com/dmdirc/res/smilies/yellow/source/neutral.svg
  5. 103
    0
      src/com/dmdirc/res/smilies/yellow/source/sad.svg
  6. 100
    0
      src/com/dmdirc/res/smilies/yellow/source/smile.svg
  7. 108
    0
      src/com/dmdirc/res/smilies/yellow/source/tongue.svg
  8. 104
    0
      src/com/dmdirc/res/smilies/yellow/source/winktongue.svg
  9. Binär
      src/com/dmdirc/res/smilies/yellow/tongue.png
  10. Binär
      src/com/dmdirc/res/smilies/yellow/winktongue.png
  11. 20
    4
      src/com/dmdirc/ui/messages/Styliser.java

Binär
src/com/dmdirc/res/smilies/yellow/neutral.png Visa fil


Binär
src/com/dmdirc/res/smilies/yellow/sad.png Visa fil


Binär
src/com/dmdirc/res/smilies/yellow/smile.png Visa fil


+ 103
- 0
src/com/dmdirc/res/smilies/yellow/source/neutral.svg Visa fil 

@@ -0,0 +1,103 @@
1 
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
3 
+<svg
4 
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
5 
+   xmlns:cc="http://creativecommons.org/ns#"
6 
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
7 
+   xmlns:svg="http://www.w3.org/2000/svg"
8 
+   xmlns="http://www.w3.org/2000/svg"
9 
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
10 
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
11 
+   width="16px"
12 
+   height="16px"
13 
+   id="svg2383"
14 
+   sodipodi:version="0.32"
15 
+   inkscape:version="0.46"
16 
+   sodipodi:docname="neutral.svg"
17 
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
18 
+   inkscape:export-filename="/home/chris/DMDirc-git/svn.dmdirc.com/src/com/dmdirc/res/smilies/yellow/sad.png"
19 
+   inkscape:export-xdpi="90"
20 
+   inkscape:export-ydpi="90">
21 
+  <defs
22 
+     id="defs2385">
23 
+    <inkscape:perspective
24 
+       sodipodi:type="inkscape:persp3d"
25 
+       inkscape:vp_x="0 : 8 : 1"
26 
+       inkscape:vp_y="0 : 1000 : 0"
27 
+       inkscape:vp_z="16 : 8 : 1"
28 
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
29 
+       id="perspective2391" />
30 
+  </defs>
31 
+  <sodipodi:namedview
32 
+     id="base"
33 
+     pagecolor="#ffffff"
34 
+     bordercolor="#666666"
35 
+     borderopacity="1.0"
36 
+     inkscape:pageopacity="0.0"
37 
+     inkscape:pageshadow="2"
38 
+     inkscape:zoom="22.197802"
39 
+     inkscape:cx="7.8648515"
40 
+     inkscape:cy="8"
41 
+     inkscape:current-layer="layer1"
42 
+     showgrid="true"
43 
+     inkscape:grid-bbox="true"
44 
+     inkscape:document-units="px"
45 
+     inkscape:window-width="1280"
46 
+     inkscape:window-height="956"
47 
+     inkscape:window-x="0"
48 
+     inkscape:window-y="0">
49 
+    <inkscape:grid
50 
+       type="xygrid"
51 
+       id="grid2393" />
52 
+  </sodipodi:namedview>
53 
+  <metadata
54 
+     id="metadata2388">
55 
+    <rdf:RDF>
56 
+      <cc:Work
57 
+         rdf:about="">
58 
+        <dc:format>image/svg+xml</dc:format>
59 
+        <dc:type
60 
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
61 
+      </cc:Work>
62 
+    </rdf:RDF>
63 
+  </metadata>
64 
+  <g
65 
+     id="layer1"
66 
+     inkscape:label="Layer 1"
67 
+     inkscape:groupmode="layer">
68 
+    <path
69 
+       sodipodi:type="arc"
70 
+       style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.11793399;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
71 
+       id="path2395"
72 
+       sodipodi:cx="8.0675745"
73 
+       sodipodi:cy="8.093812"
74 
+       sodipodi:rx="7.932426"
75 
+       sodipodi:ry="7.9512377"
76 
+       d="M 16,8.093812 A 7.932426,7.9512377 0 1 1 0.13514853,8.093812 A 7.932426,7.9512377 0 1 1 16,8.093812 z"
77 
+       transform="matrix(0.891551,0,0,0.8974732,0.8073462,0.7622576)" />
78 
+    <path
79 
+       sodipodi:type="arc"
80 
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
81 
+       id="path3167"
82 
+       sodipodi:cx="4.8653464"
83 
+       sodipodi:cy="5.7512374"
84 
+       sodipodi:rx="0.99108911"
85 
+       sodipodi:ry="1.0136138"
86 
+       d="M 5.8564355,5.7512374 A 0.99108911,1.0136138 0 1 1 3.8742573,5.7512374 A 0.99108911,1.0136138 0 1 1 5.8564355,5.7512374 z"
87 
+       transform="matrix(1.1777778,0,0,1.1777778,-0.6887569,-0.3466996)" />
88 
+    <path
89 
+       sodipodi:type="arc"
90 
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
91 
+       id="path3173"
92 
+       sodipodi:cx="4.8653464"
93 
+       sodipodi:cy="5.7512374"
94 
+       sodipodi:rx="0.99108911"
95 
+       sodipodi:ry="1.0136138"
96 
+       d="M 5.8564355,5.7512374 A 0.99108911,1.0136138 0 1 1 3.8742573,5.7512374 A 0.99108911,1.0136138 0 1 1 5.8564355,5.7512374 z"
97 
+       transform="matrix(1.1777778,0,0,1.1777778,5.4870299,-0.4593234)" />
98 
+    <path
99 
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
100 
+       d="M 12.135149,10.59406 L 4.2346535,10.54901"
101 
+       id="path3254" />
102 
+  </g>
103 
+</svg>

+ 103
- 0
src/com/dmdirc/res/smilies/yellow/source/sad.svg Visa fil 

@@ -0,0 +1,103 @@
1 
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
3 
+<svg
4 
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
5 
+   xmlns:cc="http://creativecommons.org/ns#"
6 
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
7 
+   xmlns:svg="http://www.w3.org/2000/svg"
8 
+   xmlns="http://www.w3.org/2000/svg"
9 
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
10 
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
11 
+   width="16px"
12 
+   height="16px"
13 
+   id="svg2383"
14 
+   sodipodi:version="0.32"
15 
+   inkscape:version="0.46"
16 
+   sodipodi:docname="sad.svg"
17 
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
18 
+   inkscape:export-filename="/home/chris/DMDirc-git/svn.dmdirc.com/src/com/dmdirc/res/smilies/yellow/smile.png"
19 
+   inkscape:export-xdpi="90"
20 
+   inkscape:export-ydpi="90">
21 
+  <defs
22 
+     id="defs2385">
23 
+    <inkscape:perspective
24 
+       sodipodi:type="inkscape:persp3d"
25 
+       inkscape:vp_x="0 : 8 : 1"
26 
+       inkscape:vp_y="0 : 1000 : 0"
27 
+       inkscape:vp_z="16 : 8 : 1"
28 
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
29 
+       id="perspective2391" />
30 
+  </defs>
31 
+  <sodipodi:namedview
32 
+     id="base"
33 
+     pagecolor="#ffffff"
34 
+     bordercolor="#666666"
35 
+     borderopacity="1.0"
36 
+     inkscape:pageopacity="0.0"
37 
+     inkscape:pageshadow="2"
38 
+     inkscape:zoom="22.197802"
39 
+     inkscape:cx="7.8648515"
40 
+     inkscape:cy="8"
41 
+     inkscape:current-layer="layer1"
42 
+     showgrid="true"
43 
+     inkscape:grid-bbox="true"
44 
+     inkscape:document-units="px"
45 
+     inkscape:window-width="1280"
46 
+     inkscape:window-height="956"
47 
+     inkscape:window-x="0"
48 
+     inkscape:window-y="0">
49 
+    <inkscape:grid
50 
+       type="xygrid"
51 
+       id="grid2393" />
52 
+  </sodipodi:namedview>
53 
+  <metadata
54 
+     id="metadata2388">
55 
+    <rdf:RDF>
56 
+      <cc:Work
57 
+         rdf:about="">
58 
+        <dc:format>image/svg+xml</dc:format>
59 
+        <dc:type
60 
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
61 
+      </cc:Work>
62 
+    </rdf:RDF>
63 
+  </metadata>
64 
+  <g
65 
+     id="layer1"
66 
+     inkscape:label="Layer 1"
67 
+     inkscape:groupmode="layer">
68 
+    <path
69 
+       sodipodi:type="arc"
70 
+       style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.11793399;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
71 
+       id="path2395"
72 
+       sodipodi:cx="8.0675745"
73 
+       sodipodi:cy="8.093812"
74 
+       sodipodi:rx="7.932426"
75 
+       sodipodi:ry="7.9512377"
76 
+       d="M 16,8.093812 A 7.932426,7.9512377 0 1 1 0.13514853,8.093812 A 7.932426,7.9512377 0 1 1 16,8.093812 z"
77 
+       transform="matrix(0.891551,0,0,0.8974732,0.8073462,0.7622576)" />
78 
+    <path
79 
+       sodipodi:type="arc"
80 
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
81 
+       id="path3167"
82 
+       sodipodi:cx="4.8653464"
83 
+       sodipodi:cy="5.7512374"
84 
+       sodipodi:rx="0.99108911"
85 
+       sodipodi:ry="1.0136138"
86 
+       d="M 5.8564355,5.7512374 A 0.99108911,1.0136138 0 1 1 3.8742573,5.7512374 A 0.99108911,1.0136138 0 1 1 5.8564355,5.7512374 z"
87 
+       transform="matrix(1.1777778,0,0,1.1777778,-0.6887569,-0.3466996)" />
88 
+    <path
89 
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
90 
+       d="M 4.1351485,11.967306 C 4.1351485,11.967306 7.4331684,7.7326525 12.073267,12.012356"
91 
+       id="path3171" />
92 
+    <path
93 
+       sodipodi:type="arc"
94 
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
95 
+       id="path3173"
96 
+       sodipodi:cx="4.8653464"
97 
+       sodipodi:cy="5.7512374"
98 
+       sodipodi:rx="0.99108911"
99 
+       sodipodi:ry="1.0136138"
100 
+       d="M 5.8564355,5.7512374 A 0.99108911,1.0136138 0 1 1 3.8742573,5.7512374 A 0.99108911,1.0136138 0 1 1 5.8564355,5.7512374 z"
101 
+       transform="matrix(1.1777778,0,0,1.1777778,5.4870299,-0.4593234)" />
102 
+  </g>
103 
+</svg>

+ 100
- 0
src/com/dmdirc/res/smilies/yellow/source/smile.svg Visa fil 

@@ -0,0 +1,100 @@
1 
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
3 
+<svg
4 
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
5 
+   xmlns:cc="http://creativecommons.org/ns#"
6 
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
7 
+   xmlns:svg="http://www.w3.org/2000/svg"
8 
+   xmlns="http://www.w3.org/2000/svg"
9 
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
10 
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
11 
+   width="16px"
12 
+   height="16px"
13 
+   id="svg2383"
14 
+   sodipodi:version="0.32"
15 
+   inkscape:version="0.46"
16 
+   sodipodi:docname="smile"
17 
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
18 
+  <defs
19 
+     id="defs2385">
20 
+    <inkscape:perspective
21 
+       sodipodi:type="inkscape:persp3d"
22 
+       inkscape:vp_x="0 : 8 : 1"
23 
+       inkscape:vp_y="0 : 1000 : 0"
24 
+       inkscape:vp_z="16 : 8 : 1"
25 
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
26 
+       id="perspective2391" />
27 
+  </defs>
28 
+  <sodipodi:namedview
29 
+     id="base"
30 
+     pagecolor="#ffffff"
31 
+     bordercolor="#666666"
32 
+     borderopacity="1.0"
33 
+     inkscape:pageopacity="0.0"
34 
+     inkscape:pageshadow="2"
35 
+     inkscape:zoom="22.197802"
36 
+     inkscape:cx="7.8648515"
37 
+     inkscape:cy="8"
38 
+     inkscape:current-layer="layer1"
39 
+     showgrid="true"
40 
+     inkscape:grid-bbox="true"
41 
+     inkscape:document-units="px"
42 
+     inkscape:window-width="1280"
43 
+     inkscape:window-height="956"
44 
+     inkscape:window-x="0"
45 
+     inkscape:window-y="0">
46 
+    <inkscape:grid
47 
+       type="xygrid"
48 
+       id="grid2393" />
49 
+  </sodipodi:namedview>
50 
+  <metadata
51 
+     id="metadata2388">
52 
+    <rdf:RDF>
53 
+      <cc:Work
54 
+         rdf:about="">
55 
+        <dc:format>image/svg+xml</dc:format>
56 
+        <dc:type
57 
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
58 
+      </cc:Work>
59 
+    </rdf:RDF>
60 
+  </metadata>
61 
+  <g
62 
+     id="layer1"
63 
+     inkscape:label="Layer 1"
64 
+     inkscape:groupmode="layer">
65 
+    <path
66 
+       sodipodi:type="arc"
67 
+       style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.11793399;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
68 
+       id="path2395"
69 
+       sodipodi:cx="8.0675745"
70 
+       sodipodi:cy="8.093812"
71 
+       sodipodi:rx="7.932426"
72 
+       sodipodi:ry="7.9512377"
73 
+       d="M 16,8.093812 A 7.932426,7.9512377 0 1 1 0.13514853,8.093812 A 7.932426,7.9512377 0 1 1 16,8.093812 z"
74 
+       transform="matrix(0.891551,0,0,0.8974732,0.8073462,0.7622576)" />
75 
+    <path
76 
+       sodipodi:type="arc"
77 
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
78 
+       id="path3167"
79 
+       sodipodi:cx="4.8653464"
80 
+       sodipodi:cy="5.7512374"
81 
+       sodipodi:rx="0.99108911"
82 
+       sodipodi:ry="1.0136138"
83 
+       d="M 5.8564355,5.7512374 A 0.99108911,1.0136138 0 1 1 3.8742573,5.7512374 A 0.99108911,1.0136138 0 1 1 5.8564355,5.7512374 z"
84 
+       transform="matrix(1.1777778,0,0,1.1777778,-0.6887569,-0.3466996)" />
85 
+    <path
86 
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
87 
+       d="M 4.1351485,10.143565 C 4.1351485,10.143565 7.4331684,14.378218 12.073267,10.098515"
88 
+       id="path3171" />
89 
+    <path
90 
+       sodipodi:type="arc"
91 
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
92 
+       id="path3173"
93 
+       sodipodi:cx="4.8653464"
94 
+       sodipodi:cy="5.7512374"
95 
+       sodipodi:rx="0.99108911"
96 
+       sodipodi:ry="1.0136138"
97 
+       d="M 5.8564355,5.7512374 A 0.99108911,1.0136138 0 1 1 3.8742573,5.7512374 A 0.99108911,1.0136138 0 1 1 5.8564355,5.7512374 z"
98 
+       transform="matrix(1.1777778,0,0,1.1777778,5.4870299,-0.4593234)" />
99 
+  </g>
100 
+</svg>

+ 108
- 0
src/com/dmdirc/res/smilies/yellow/source/tongue.svg Visa fil 

@@ -0,0 +1,108 @@
1 
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
3 
+<svg
4 
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
5 
+   xmlns:cc="http://creativecommons.org/ns#"
6 
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
7 
+   xmlns:svg="http://www.w3.org/2000/svg"
8 
+   xmlns="http://www.w3.org/2000/svg"
9 
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
10 
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
11 
+   width="16px"
12 
+   height="16px"
13 
+   id="svg2383"
14 
+   sodipodi:version="0.32"
15 
+   inkscape:version="0.46"
16 
+   sodipodi:docname="tongue.svg"
17 
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
18 
+   inkscape:export-filename="/home/chris/DMDirc-git/svn.dmdirc.com/src/com/dmdirc/res/smilies/yellow/neutral.png"
19 
+   inkscape:export-xdpi="90"
20 
+   inkscape:export-ydpi="90">
21 
+  <defs
22 
+     id="defs2385">
23 
+    <inkscape:perspective
24 
+       sodipodi:type="inkscape:persp3d"
25 
+       inkscape:vp_x="0 : 8 : 1"
26 
+       inkscape:vp_y="0 : 1000 : 0"
27 
+       inkscape:vp_z="16 : 8 : 1"
28 
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
29 
+       id="perspective2391" />
30 
+  </defs>
31 
+  <sodipodi:namedview
32 
+     id="base"
33 
+     pagecolor="#ffffff"
34 
+     bordercolor="#666666"
35 
+     borderopacity="1.0"
36 
+     inkscape:pageopacity="0.0"
37 
+     inkscape:pageshadow="2"
38 
+     inkscape:zoom="22.197802"
39 
+     inkscape:cx="7.8648515"
40 
+     inkscape:cy="8"
41 
+     inkscape:current-layer="layer1"
42 
+     showgrid="true"
43 
+     inkscape:grid-bbox="true"
44 
+     inkscape:document-units="px"
45 
+     inkscape:window-width="1280"
46 
+     inkscape:window-height="956"
47 
+     inkscape:window-x="0"
48 
+     inkscape:window-y="0">
49 
+    <inkscape:grid
50 
+       type="xygrid"
51 
+       id="grid2393" />
52 
+  </sodipodi:namedview>
53 
+  <metadata
54 
+     id="metadata2388">
55 
+    <rdf:RDF>
56 
+      <cc:Work
57 
+         rdf:about="">
58 
+        <dc:format>image/svg+xml</dc:format>
59 
+        <dc:type
60 
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
61 
+      </cc:Work>
62 
+    </rdf:RDF>
63 
+  </metadata>
64 
+  <g
65 
+     id="layer1"
66 
+     inkscape:label="Layer 1"
67 
+     inkscape:groupmode="layer">
68 
+    <path
69 
+       sodipodi:type="arc"
70 
+       style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.11793399;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
71 
+       id="path2395"
72 
+       sodipodi:cx="8.0675745"
73 
+       sodipodi:cy="8.093812"
74 
+       sodipodi:rx="7.932426"
75 
+       sodipodi:ry="7.9512377"
76 
+       d="M 16,8.093812 A 7.932426,7.9512377 0 1 1 0.13514853,8.093812 A 7.932426,7.9512377 0 1 1 16,8.093812 z"
77 
+       transform="matrix(0.891551,0,0,0.8974732,0.8073462,0.7622576)" />
78 
+    <path
79 
+       sodipodi:type="arc"
80 
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
81 
+       id="path3167"
82 
+       sodipodi:cx="4.8653464"
83 
+       sodipodi:cy="5.7512374"
84 
+       sodipodi:rx="0.99108911"
85 
+       sodipodi:ry="1.0136138"
86 
+       d="M 5.8564355,5.7512374 A 0.99108911,1.0136138 0 1 1 3.8742573,5.7512374 A 0.99108911,1.0136138 0 1 1 5.8564355,5.7512374 z"
87 
+       transform="matrix(1.1777778,0,0,1.1777778,-0.6887569,-0.3466996)" />
88 
+    <path
89 
+       sodipodi:type="arc"
90 
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
91 
+       id="path3173"
92 
+       sodipodi:cx="4.8653464"
93 
+       sodipodi:cy="5.7512374"
94 
+       sodipodi:rx="0.99108911"
95 
+       sodipodi:ry="1.0136138"
96 
+       d="M 5.8564355,5.7512374 A 0.99108911,1.0136138 0 1 1 3.8742573,5.7512374 A 0.99108911,1.0136138 0 1 1 5.8564355,5.7512374 z"
97 
+       transform="matrix(1.1777778,0,0,1.1777778,5.4870299,-0.4593234)" />
98 
+    <path
99 
+       style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
100 
+       d="M 11.049079,10.948182 C 11.049079,10.948182 11.252877,12.85131 10.237689,12.85131 C 9.2225003,12.85131 9.4362242,10.924541 9.4362242,10.924541"
101 
+       id="path3276"
102 
+       sodipodi:nodetypes="csc" />
103 
+    <path
104 
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
105 
+       d="M 12.04505,10.558415 L 4.1445545,10.513365"
106 
+       id="path3254" />
107 
+  </g>
108 
+</svg>

+ 104
- 0
src/com/dmdirc/res/smilies/yellow/source/winktongue.svg Visa fil 

@@ -0,0 +1,104 @@
1 
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2 
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
3 
+<svg
4 
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
5 
+   xmlns:cc="http://creativecommons.org/ns#"
6 
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
7 
+   xmlns:svg="http://www.w3.org/2000/svg"
8 
+   xmlns="http://www.w3.org/2000/svg"
9 
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
10 
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
11 
+   width="16px"
12 
+   height="16px"
13 
+   id="svg2383"
14 
+   sodipodi:version="0.32"
15 
+   inkscape:version="0.46"
16 
+   sodipodi:docname="winktongue.svg"
17 
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
18 
+   inkscape:export-filename="/home/chris/DMDirc-git/svn.dmdirc.com/src/com/dmdirc/res/smilies/yellow/tongue.png"
19 
+   inkscape:export-xdpi="90"
20 
+   inkscape:export-ydpi="90">
21 
+  <defs
22 
+     id="defs2385">
23 
+    <inkscape:perspective
24 
+       sodipodi:type="inkscape:persp3d"
25 
+       inkscape:vp_x="0 : 8 : 1"
26 
+       inkscape:vp_y="0 : 1000 : 0"
27 
+       inkscape:vp_z="16 : 8 : 1"
28 
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
29 
+       id="perspective2391" />
30 
+  </defs>
31 
+  <sodipodi:namedview
32 
+     id="base"
33 
+     pagecolor="#ffffff"
34 
+     bordercolor="#666666"
35 
+     borderopacity="1.0"
36 
+     inkscape:pageopacity="0.0"
37 
+     inkscape:pageshadow="2"
38 
+     inkscape:zoom="22.197802"
39 
+     inkscape:cx="7.8648515"
40 
+     inkscape:cy="6.1980198"
41 
+     inkscape:current-layer="layer1"
42 
+     showgrid="true"
43 
+     inkscape:grid-bbox="true"
44 
+     inkscape:document-units="px"
45 
+     inkscape:window-width="1280"
46 
+     inkscape:window-height="956"
47 
+     inkscape:window-x="0"
48 
+     inkscape:window-y="0">
49 
+    <inkscape:grid
50 
+       type="xygrid"
51 
+       id="grid2393" />
52 
+  </sodipodi:namedview>
53 
+  <metadata
54 
+     id="metadata2388">
55 
+    <rdf:RDF>
56 
+      <cc:Work
57 
+         rdf:about="">
58 
+        <dc:format>image/svg+xml</dc:format>
59 
+        <dc:type
60 
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
61 
+      </cc:Work>
62 
+    </rdf:RDF>
63 
+  </metadata>
64 
+  <g
65 
+     id="layer1"
66 
+     inkscape:label="Layer 1"
67 
+     inkscape:groupmode="layer">
68 
+    <path
69 
+       sodipodi:type="arc"
70 
+       style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.11793399;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
71 
+       id="path2395"
72 
+       sodipodi:cx="8.0675745"
73 
+       sodipodi:cy="8.093812"
74 
+       sodipodi:rx="7.932426"
75 
+       sodipodi:ry="7.9512377"
76 
+       d="M 16,8.093812 A 7.932426,7.9512377 0 1 1 0.13514853,8.093812 A 7.932426,7.9512377 0 1 1 16,8.093812 z"
77 
+       transform="matrix(0.891551,0,0,0.8974732,0.8073462,0.7622576)" />
78 
+    <path
79 
+       sodipodi:type="arc"
80 
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
81 
+       id="path3173"
82 
+       sodipodi:cx="4.8653464"
83 
+       sodipodi:cy="5.7512374"
84 
+       sodipodi:rx="0.99108911"
85 
+       sodipodi:ry="1.0136138"
86 
+       d="M 5.8564355,5.7512374 A 0.99108911,1.0136138 0 1 1 3.8742573,5.7512374 A 0.99108911,1.0136138 0 1 1 5.8564355,5.7512374 z"
87 
+       transform="matrix(1.1777778,0,0,1.1777778,5.4870299,-0.4593234)" />
88 
+    <path
89 
+       style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
90 
+       d="M 11.049079,10.948182 C 11.049079,10.948182 11.252877,12.85131 10.237689,12.85131 C 9.2225003,12.85131 9.4362242,10.924541 9.4362242,10.924541"
91 
+       id="path3276"
92 
+       sodipodi:nodetypes="csc" />
93 
+    <path
94 
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
95 
+       d="M 11.667822,10.54901 L 11.667822,10.54901 C 11.667822,10.54901 4.289109,11.530198 4.1445545,8.0262376"
96 
+       id="path3438"
97 
+       sodipodi:nodetypes="ccc" />
98 
+    <path
99 
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01119423px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
100 
+       d="M 4.0450495,5.4988583 L 7.2774197,5.555102"
101 
+       id="path3446"
102 
+       sodipodi:nodetypes="cc" />
103 
+  </g>
104 
+</svg>

Binär
src/com/dmdirc/res/smilies/yellow/tongue.png Visa fil


Binär
src/com/dmdirc/res/smilies/yellow/winktongue.png Visa fil


+ 20
- 4
src/com/dmdirc/ui/messages/Styliser.java Visa fil 

@@ -31,6 +31,8 @@ import com.dmdirc.logger.Logger;
31 31
32 32 
 import java.awt.Color;
33 33 
 import java.util.Locale;
34 
+import java.util.Map;
35 
+import java.util.regex.Pattern;
34 36
35 37 
 import javax.swing.UIManager;
36 38 
 import javax.swing.text.BadLocationException;
 
@@ -313,11 +315,25 @@ public class Styliser implements ConfigChangeListener {
313 315 
      * @return A copy of the string with smilies marked up
314 316 
      * @since 0.6.3m1
315 317 
      */
316 
-    public static String doSmilies(final String string) {
317 
-        // TODO: read types from config. Check if they're enabled.
318 
+    public String doSmilies(final String string) {
319 
+        // TODO: Check if they're enabled.
320 
+        // TODO: Store the list instead of building it every line
318 321
319 
-        return string.replaceAll("(\\s|^):[\\\\/](?=\\s|$)", "$1" + CODE_SMILIE + ":/"
320 
-                + CODE_SMILIE);
322 
+        final StringBuilder smilies = new StringBuilder();
323 
+
324 
+        for (Map.Entry<String, String> icon
325 
+                : owner.getConfigManager().getOptions("icon").entrySet()) {
326 
+            if (icon.getKey().startsWith("smilie-")) {
327 
+                if (smilies.length() > 0) {
328 
+                    smilies.append('|');
329 
+                }
330 
+
331 
+                smilies.append(Pattern.quote(icon.getKey().substring(7)));
332 
+            }
333 
+        }
334 
+
335 
+        return string.replaceAll("(\\s|^)(" + smilies + ")(?=\\s|$)",
336 
+                "$1" + CODE_SMILIE + "$2" + CODE_SMILIE);
321 337 
     }
322 338
323 339 
     /**

Write Förhandsgranska
Laddar…
Avbryt
Spara