mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-03-02 13:49:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #355 from guusdk/efficiency

Browse Source 
Efficiency
This commit is contained in:
wroot
2017-07-23 11:42:22 +03:00
committed by GitHub
parent eab7e3c409 a47a46e37c
commit a69eb3835c
105 changed files with 1251 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/pom.xml
View File

@ -69,6 +69,34 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.igniterealtime.spark</groupId>
<artifactId>emoticons</artifactId>
<version>${project.version}</version>
<classifier>Default.adiumemoticonset</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.igniterealtime.spark</groupId>
<artifactId>emoticons</artifactId>
<version>${project.version}</version>
<classifier>GTalk.AdiumEmoticonset</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.igniterealtime.spark</groupId>
<artifactId>emoticons</artifactId>
<version>${project.version}</version>
<classifier>POPO.adiumemoticonset</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.igniterealtime.spark</groupId>
<artifactId>emoticons</artifactId>
<version>${project.version}</version>
<classifier>sparkEmoticonSet</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.igniterealtime.smack</groupId>
<artifactId>smack-core</artifactId>

18
core/src/assembly/installation-directory.xml
View File

@ -10,6 +10,17 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<excludes>
<exclude>org.igniterealtime.spark:emoticons</exclude>
</excludes>
</dependencySet>
<dependencySet>
<outputDirectory>xtra/emoticons</outputDirectory>
<scope>runtime</scope>
<includes>
<include>org.igniterealtime.spark:emoticons</include>
</includes>
<outputFileNameMapping>${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
@ -19,11 +30,6 @@
<outputDirectory>lib</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/xtra/</directory>
<outputDirectory>xtra</outputDirectory>
</fileSet>
<fileSet>
<!-- create an empty directory that's named 'plugins' -->
<directory>src/main/resources/</directory>
@ -49,4 +55,4 @@
<fileMode>0755</fileMode>
</file>
</files>
</assembly>
</assembly>

2
core/src/main/java/org/jivesoftware/spark/ui/MessageEntry.java
View File

@ -207,7 +207,7 @@ public class MessageEntry extends TimeStampedEntry
return false;
}
final Icon emotion = EmoticonManager.getInstance().getEmoticonImage( imageKey.toLowerCase() );
final Icon emotion = EmoticonManager.getInstance().getEmoticonImage( imageKey );
if ( emotion == null )
{
return false;

BIN
core/src/main/xtra/emoticons/Default.adiumemoticonset.zip
View File

Binary file not shown.

BIN
core/src/main/xtra/emoticons/GTalk.AdiumEmoticonset.zip
View File

Binary file not shown.

BIN
core/src/main/xtra/emoticons/POPO.adiumemoticonset.zip
View File

Binary file not shown.

BIN
core/src/main/xtra/emoticons/sparkEmoticonSet.zip
View File

Binary file not shown.

59
emoticons/pom.xml Normal file
View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2017 Ignite Realtime Foundation. All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.igniterealtime.spark</groupId>
<artifactId>parent</artifactId>
<version>2.9.0-SNAPSHOT</version>
</parent>
<artifactId>emoticons</artifactId>
<name>Spark Emoticons</name>
<description>Sets of emoticons used by Spark.</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<descriptors>
<descriptor>src/assembly/Default.adiumemoticonset.xml</descriptor>
<descriptor>src/assembly/GTalk.AdiumEmoticonset.xml</descriptor>
<descriptor>src/assembly/POPO.adiumemoticonset.xml</descriptor>
<descriptor>src/assembly/sparkEmoticonSet.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

32
emoticons/src/assembly/Default.adiumemoticonset.xml Normal file
View File

@ -0,0 +1,32 @@
<!--
~ Copyright (c) 2017 Ignite Realtime Foundation. All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>Default.adiumemoticonset</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/Default.adiumemoticonset</directory>
<outputDirectory>Default.adiumemoticonset</outputDirectory>
</fileSet>
</fileSets>
</assembly>

32
emoticons/src/assembly/GTalk.AdiumEmoticonset.xml Normal file
View File

@ -0,0 +1,32 @@
<!--
~ Copyright (c) 2017 Ignite Realtime Foundation. All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>GTalk.AdiumEmoticonset</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/GTalk.AdiumEmoticonset</directory>
<outputDirectory>GTalk.AdiumEmoticonset</outputDirectory>
</fileSet>
</fileSets>
</assembly>

32
emoticons/src/assembly/POPO.adiumemoticonset.xml Normal file
View File

@ -0,0 +1,32 @@
<!--
~ Copyright (c) 2017 Ignite Realtime Foundation. All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>POPO.adiumemoticonset</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/POPO.adiumemoticonset</directory>
<outputDirectory>POPO.adiumemoticonset</outputDirectory>
</fileSet>
</fileSets>
</assembly>

32
emoticons/src/assembly/sparkEmoticonSet.xml Normal file
View File

@ -0,0 +1,32 @@
<!--
~ Copyright (c) 2017 Ignite Realtime Foundation. All rights reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>sparkEmoticonSet</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/sparkEmoticonSet</directory>
<outputDirectory>sparkEmoticonSet</outputDirectory>
</fileSet>
</fileSets>
</assembly>

251
emoticons/src/main/Default.adiumemoticonset/Emoticons.plist Normal file
View File

@ -0,0 +1,251 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SparkSetVersion</key>
<integer>1</integer>
<key>Emoticons</key>
<dict>
<key>angry.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>&gt;:o</string>
<string>&gt;:-o</string>
<string>&gt;:O</string>
<string>&gt;:-O</string>
<string></string>
</array>
<key>Name</key>
<string>Angry</string>
</dict>
<key>blush.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-[</string>
</array>
<key>Name</key>
<string>Blush</string>
</dict>
<key>confused.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>?:|</string>
</array>
<key>Name</key>
<string>Confused</string>
</dict>
<key>cool.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>B-)</string>
<string>&#x1f60e;</string>
</array>
<key>Name</key>
<string>Cool</string>
</dict>
<key>cry.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:'(</string>
<string></string>
</array>
<key>Name</key>
<string>Cry</string>
</dict>
<key>devil.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>]:)</string>
</array>
<key>Name</key>
<string>Devil</string>
</dict>
<key>grin.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-D</string>
<string>:D</string>
<string>&#x1f604;</string>
<string>&#x1f603;</string>
<string>&#x1f602;</string>
<string>&#x1f601;</string>
<string>&#x1f600;</string>
<string></string>
</array>
<key>Name</key>
<string>Grin</string>
</dict>
<key>happy.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-)</string>
</array>
<key>Name</key>
<string>Happy</string>
</dict>
<key>laugh.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:^0</string>
<string>&#x1f605;</string>
<string>&#x1f606;</string>
</array>
<key>Name</key>
<string>Laugh</string>
</dict>
<key>love.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:x</string>
<string>&#x1f60d;</string>
<string>&#x1f618;</string>
</array>
<key>Name</key>
<string>Love</string>
</dict>
<key>mischief.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>;\</string>
</array>
<key>Name</key>
<string>Mischief</string>
</dict>
<key>sad.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-(</string>
<string>:(</string>
<string>&#x2639;</string>
<string></string>
</array>
<key>Name</key>
<string>Sad</string>
</dict>
<key>happy.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-)</string>
<string>:)</string>
<string>&#x1f60a;</string>
<string>&#x1f642;</string>
<string>&#x263a;</string>
<string></string>
</array>
<key>Name</key>
<string>Smile</string>
</dict>
<key>plain.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:|</string>
<string></string>
</array>
<key>Name</key>
<string>Plain</string>
</dict>
<key>shocked.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:0</string>
<string></string>
</array>
<key>Name</key>
<string>Shocked</string>
</dict>
<key>silly.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-p</string>
<string>:-P</string>
<string>:P</string>
<string>:p</string>
<string>&#x1f60b;</string>
<string>&#x1f61c;</string>
<string>&#x1f61d;</string>
<string></string>
</array>
<key>Name</key>
<string>Tongue</string>
</dict>
<key>wink.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>;-)</string>
<string>;)</string>
<string>&#x1f609;</string>
<string></string>
</array>
<key>Name</key>
<string>Wink</string>
</dict>
<key>alert.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(!)</string>
</array>
<key>Name</key>
<string>Alert</string>
</dict>
<key>info.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(i)</string>
</array>
<key>Name</key>
<string>Info</string>
</dict>
<key>minus.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(-)</string>
</array>
<key>Name</key>
<string>Minus</string>
</dict>
<key>plus.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(+)</string>
</array>
<key>Name</key>
<string>Plus</string>
</dict>
<key>heart.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(heart)</string>
</array>
<key>Name</key>
<string>Heart</string>
</dict>
</dict>
</dict>
</plist>

BIN
emoticons/src/main/Default.adiumemoticonset/alert.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 701 B

BIN
emoticons/src/main/Default.adiumemoticonset/angry.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 894 B

BIN
emoticons/src/main/Default.adiumemoticonset/blush.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 887 B

BIN
emoticons/src/main/Default.adiumemoticonset/confused.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 973 B

BIN
emoticons/src/main/Default.adiumemoticonset/cool.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 931 B

BIN
emoticons/src/main/Default.adiumemoticonset/cry.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 970 B

BIN
emoticons/src/main/Default.adiumemoticonset/devil.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1005 B

BIN
emoticons/src/main/Default.adiumemoticonset/eyeRoll.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
emoticons/src/main/Default.adiumemoticonset/grin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 879 B

BIN
emoticons/src/main/Default.adiumemoticonset/happy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 852 B

BIN
emoticons/src/main/Default.adiumemoticonset/heart.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 749 B

BIN
emoticons/src/main/Default.adiumemoticonset/info.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 778 B

BIN
emoticons/src/main/Default.adiumemoticonset/laugh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 860 B

BIN
emoticons/src/main/Default.adiumemoticonset/love.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 964 B

BIN
emoticons/src/main/Default.adiumemoticonset/minus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 715 B

BIN
emoticons/src/main/Default.adiumemoticonset/mischief.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 932 B

BIN
emoticons/src/main/Default.adiumemoticonset/party.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
emoticons/src/main/Default.adiumemoticonset/plain.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 847 B

BIN
emoticons/src/main/Default.adiumemoticonset/plus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 733 B

BIN
emoticons/src/main/Default.adiumemoticonset/sad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 926 B

BIN
emoticons/src/main/Default.adiumemoticonset/shocked.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 896 B

BIN
emoticons/src/main/Default.adiumemoticonset/silly.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 892 B

BIN
emoticons/src/main/Default.adiumemoticonset/sleepy.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 708 B

BIN
emoticons/src/main/Default.adiumemoticonset/wink.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 864 B

182
emoticons/src/main/GTalk.AdiumEmoticonset/Emoticons.plist Normal file
View File

@ -0,0 +1,182 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>AdiumSetVersion</key>
<integer>1</integer>
<key>Emoticons</key>
<dict>
<key>angry.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>X-(</string>
<string>X(</string>
</array>
<key>Name</key>
<string>Angry Face</string>
</dict>
<key>shocked.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-O</string>
<string>:-o</string>
<string>:O</string>
<string>:o</string>
<string></string>
</array>
<key>Name</key>
<string>Shock</string>
</dict>
<key>cool.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>B-)</string>
<string>B)</string>
<string>&#x1f60e;</string>
</array>
<key>Name</key>
<string>Cool</string>
</dict>
<key>Cry.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>:'(</string>
</array>
<key>Name</key>
<string>Cry</string>
</dict>
<key>smile.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>=)</string>
<string>:)</string>
<string>&#x263a;</string>
<string>&#x1f60a;</string>
<string>&#x1f642;</string>
</array>
<key>Name</key>
<string>Smile</string>
</dict>
<key>rockout.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>\m/</string>
</array>
<key>Name</key>
<string>Rockout</string>
</dict>
<key>Grin.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>:D</string>
<string>=D</string>
<string>:'D</string>
<string>='D</string>
<string>&#x1f604;</string>
<string>&#x1f603;</string>
<string>&#x1f602;</string>
<string>&#x1f601;</string>
<string>&#x1f600;</string>
<string>&#x1f605;</string>
<string>&#x1f606;</string>
</array>
<key>Name</key>
<string>Grin</string>
</dict>
<key>frown.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>:(</string>
<string>=(</string>
<string>&#x2639;</string>
</array>
<key>Name</key>
<string>Frown</string>
</dict>
<key>wink.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>;)</string>
<string>;-)</string>
<string>&#x1f609;</string>
</array>
<key>Name</key>
<string>Wink</string>
</dict>
<key>tongue.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>:P</string>
<string>:p</string>
<string>:-P</string>
<string>:-p</string>
<string>=P</string>
<string>=p</string>
<string>&#x1f60b;</string>
<string>&#x1f61c;</string>
<string>&#x1f61d;</string>
</array>
<key>Name</key>
<string>Tongue</string>
</dict>
<key>straightface.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-|</string>
<string>:|</string>
</array>
<key>Name</key>
<string>Straight</string>
</dict>
<key>slant.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-/</string>
<string>:/</string>
</array>
<key>Name</key>
<string>Slant</string>
</dict>
<key>Monkey.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>:(|)</string>
<string>(monkey)</string>
</array>
<key>Name</key>
<string>Monkey</string>
</dict>
<key>Heart.gif</key>
<dict>
<key>Equivalents</key>
<array>
<string>&lt;3</string>
</array>
<key>Name</key>
<string>Heart</string>
</dict>
</dict>
</dict>
</plist>

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/angry.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/cool.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/cry.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 991 B

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/frown.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/grin.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/heart.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/monkey.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/rockout.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/shocked.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/slant.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/smile.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/straightface.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/tongue.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
emoticons/src/main/GTalk.AdiumEmoticonset/wink.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/.DS_Store vendored Normal file
View File

Binary file not shown.

338
emoticons/src/main/POPO.adiumemoticonset/Emoticons.plist Normal file
View File

@ -0,0 +1,338 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>AdiumSetVersion</key>
<integer>1</integer>
<key>Emoticons</key>
<dict>
<key>choler.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>&gt;:o</string>
<string>:-@</string>
<string>X(</string>
</array>
<key>Name</key>
<string>Angry</string>
</dict>
<key>boss.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>8-)</string>
<string>(H)</string>
<string>&#x1f60e;</string>
<string>B-)</string>
</array>
<key>Name</key>
<string>Cool</string>
</dict>
<key>too_sad.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:'(</string>
<string>:'-(</string>
<string>:((</string>
<string>:-((</string>
</array>
<key>Name</key>
<string>Crying</string>
</dict>
<key>confuse.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-\</string>
<string>:-S</string>
</array>
<key>Name</key>
<string>Confused</string>
</dict>
<key>embarrassed.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-[</string>
<string>:[</string>
<string>:-$</string>
<string>:&quot;&gt;</string>
</array>
<key>Name</key>
<string>Embarassed</string>
</dict>
<key>beat_brick.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-!</string>
</array>
<key>Name</key>
<string>Faux Pas</string>
</dict>
<key>sad.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-(</string>
<string>:(</string>
<string>&#x2639;</string>
</array>
<key>Name</key>
<string>Frown</string>
</dict>
<key>big_smile.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-D</string>
<string>:D</string>
<string>&#x1f604;</string>
<string>&#x1f603;</string>
<string>&#x1f602;</string>
<string>&#x1f601;</string>
<string>&#x1f600;</string>
<string>&#x1f605;</string>
<string>&#x1f606;</string>
</array>
<key>Name</key>
<string>Grin</string>
</dict>
<key>adore.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>O:-)</string>
<string>O:)</string>
<string>o:-)</string>
<string>o:)</string>
<string>(A)</string>
</array>
<key>Name</key>
<string>Innocent</string>
</dict>
<key>sweet_kiss.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-*</string>
<string>(K)</string>
<string>&#x1f619;</string>
<string>&#x1f618;</string>
<string>&#x1f617;</string>
<string>&#x1f61a;</string>
</array>
<key>Name</key>
<string>Kiss</string>
</dict>
<key>canny.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-x</string>
<string>:-X</string>
<string>:-#</string>
</array>
<key>Name</key>
<string>Lips are Sealed</string>
</dict>
<key>smile.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-)</string>
<string>:)</string>
<string>&#x1f60a;</string>
<string>&#x1f642;</string>
<string>&#x263a;</string>
</array>
<key>Name</key>
<string>Smile</string>
</dict>
<key>waaaht.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>=-o</string>
<string>=-O</string>
</array>
<key>Name</key>
<string>Surprised</string>
</dict>
<key>amazed.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-|</string>
</array>
<key>Name</key>
<string>Straight Face</string>
</dict>
<key>thbbbpt.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-P</string>
<string>:-p</string>
<string>:p</string>
<string>:P</string>
<string>&#x1f60b;</string>
<string>&#x1f61c;</string>
<string>&#x1f61d;</string>
</array>
<key>Name</key>
<string>Sticking Out Tongue</string>
</dict>
<key>look_down.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>;-)</string>
<string>;)</string>
<string>&#x1f609;</string>
</array>
<key>Name</key>
<string>Wink</string>
</dict>
<key>tire.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(:|</string>
</array>
<key>Name</key>
<string>Yawn</string>
</dict>
<key>matrix.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:neo:</string>
<string>:matrix:</string>
</array>
<key>Name</key>
<string>Neo</string>
</dict>
<key>spidy.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:spider-man:</string>
<string>:spidy:</string>
</array>
<key>Name</key>
<string>Spider-Man</string>
</dict>
<key>hell_boy.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:hellboy:</string>
<string>:evil:</string>
<string>:devil:</string>
</array>
<key>Name</key>
<string>Hellboy</string>
</dict>
<key>doubt.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:doubt:</string>
</array>
<key>Name</key>
<string>Doubt</string>
</dict>
<key>sure.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:sure:</string>
</array>
<key>Name</key>
<string>Sure</string>
</dict>
<key>stilldreaming.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:dreaming:</string>
</array>
<key>Name</key>
<string>Dreaming</string>
</dict>
<key>hungry.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:hungry:</string>
</array>
<key>Name</key>
<string>Hungry</string>
</dict>
<key>oops.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:oops:</string>
<string>:ops:</string>
</array>
<key>Name</key>
<string>Oops</string>
</dict>
<key>ah.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:ah:</string>
<string>:argh:</string>
<string>:scream:</string>
</array>
<key>Name</key>
<string>Ah</string>
</dict>
<key>surrender.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:surrender:</string>
<string>:giveup:</string>
</array>
<key>Name</key>
<string>Surrender</string>
</dict>
<key>byebye.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:bye:</string>
<string>:byebye:</string>
</array>
<key>Name</key>
<string>Bye</string>
</dict>
<key>misdoubt.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:misdoubt:</string>
<string>:suspect:</string>
</array>
<key>Name</key>
<string>Misdoubt</string>
</dict>
<key>afterboom.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:afterboom:</string>
<string>:boom:</string>
</array>
<key>Name</key>
<string>Boom</string>
</dict>
</dict>
</dict>
</plist>

BIN
emoticons/src/main/POPO.adiumemoticonset/adore.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/afterboom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/ah.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/amazed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/beat_brick.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/big_smile.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/boss.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/byebye.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/canny.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/choler.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/confuse.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/doubt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/embarrassed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/hell_boy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/hungry.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/look_down.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/matrix.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/misdoubt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/oops.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/sad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/smile.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/spidy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/stilldreaming.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/sure.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/surrender.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/sweet_kiss.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/thbbbpt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/tire.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/too_sad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
emoticons/src/main/POPO.adiumemoticonset/waaaht.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

251
emoticons/src/main/sparkEmoticonSet/Emoticons.plist Normal file
View File

@ -0,0 +1,251 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SparkSetVersion</key>
<integer>1</integer>
<key>Emoticons</key>
<dict>
<key>angry.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>&gt;:o</string>
<string>&gt;:-o</string>
<string>&gt;:O</string>
<string>&gt;:-O</string>
<string></string>
</array>
<key>Name</key>
<string>Angry</string>
</dict>
<key>blush.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-[</string>
</array>
<key>Name</key>
<string>Blush</string>
</dict>
<key>confused.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>?:|</string>
</array>
<key>Name</key>
<string>Confused</string>
</dict>
<key>cool.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>B-)</string>
<string>&#x1f60e;</string>
</array>
<key>Name</key>
<string>Cool</string>
</dict>
<key>cry.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:'(</string>
<string></string>
</array>
<key>Name</key>
<string>Cry</string>
</dict>
<key>devil.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>]:)</string>
</array>
<key>Name</key>
<string>Devil</string>
</dict>
<key>grin.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-D</string>
<string>:D</string>
<string>&#x1f604;</string>
<string>&#x1f603;</string>
<string>&#x1f602;</string>
<string>&#x1f601;</string>
<string>&#x1f600;</string>
<string></string>
</array>
<key>Name</key>
<string>Grin</string>
</dict>
<key>happy.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-)</string>
</array>
<key>Name</key>
<string>Happy</string>
</dict>
<key>laugh.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:^0</string>
<string>&#x1f605;</string>
<string>&#x1f606;</string>
</array>
<key>Name</key>
<string>Laugh</string>
</dict>
<key>love.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:x</string>
<string>&#x1f60d;</string>
<string>&#x1f618;</string>
</array>
<key>Name</key>
<string>Love</string>
</dict>
<key>mischief.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>;\</string>
</array>
<key>Name</key>
<string>Mischief</string>
</dict>
<key>sad.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-(</string>
<string>:(</string>
<string>&#x2639;</string>
<string></string>
</array>
<key>Name</key>
<string>Sad</string>
</dict>
<key>happy.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-)</string>
<string>:)</string>
<string>&#x1f60a;</string>
<string>&#x1f642;</string>
<string>&#x263a;</string>
<string></string>
</array>
<key>Name</key>
<string>Smile</string>
</dict>
<key>plain.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:|</string>
<string></string>
</array>
<key>Name</key>
<string>Plain</string>
</dict>
<key>shocked.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:0</string>
<string></string>
</array>
<key>Name</key>
<string>Shocked</string>
</dict>
<key>silly.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>:-p</string>
<string>:-P</string>
<string>:P</string>
<string>:p</string>
<string>&#x1f60b;</string>
<string>&#x1f61c;</string>
<string>&#x1f61d;</string>
<string></string>
</array>
<key>Name</key>
<string>Tongue</string>
</dict>
<key>wink.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>;-)</string>
<string>;)</string>
<string>&#x1f609;</string>
<string></string>
</array>
<key>Name</key>
<string>Wink</string>
</dict>
<key>alert.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(!)</string>
</array>
<key>Name</key>
<string>Alert</string>
</dict>
<key>info.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(i)</string>
</array>
<key>Name</key>
<string>Info</string>
</dict>
<key>minus.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(-)</string>
</array>
<key>Name</key>
<string>Minus</string>
</dict>
<key>plus.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(+)</string>
</array>
<key>Name</key>
<string>Plus</string>
</dict>
<key>heart.png</key>
<dict>
<key>Equivalents</key>
<array>
<string>(heart)</string>
</array>
<key>Name</key>
<string>Heart</string>
</dict>
</dict>
</dict>
</plist>

BIN
emoticons/src/main/sparkEmoticonSet/angry.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 894 B

BIN
emoticons/src/main/sparkEmoticonSet/blush.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 887 B

BIN
emoticons/src/main/sparkEmoticonSet/confused.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 973 B

BIN
emoticons/src/main/sparkEmoticonSet/cool.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 931 B

BIN
emoticons/src/main/sparkEmoticonSet/cry.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 970 B

BIN
emoticons/src/main/sparkEmoticonSet/devil.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1005 B

BIN
emoticons/src/main/sparkEmoticonSet/eyeRoll.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
emoticons/src/main/sparkEmoticonSet/grin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 879 B

BIN
emoticons/src/main/sparkEmoticonSet/happy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 852 B

BIN
emoticons/src/main/sparkEmoticonSet/laugh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 860 B

BIN
emoticons/src/main/sparkEmoticonSet/love.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 964 B

BIN
emoticons/src/main/sparkEmoticonSet/mischief.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 932 B

BIN
emoticons/src/main/sparkEmoticonSet/party.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
emoticons/src/main/sparkEmoticonSet/plain.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 847 B

BIN
emoticons/src/main/sparkEmoticonSet/sad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 926 B

Some files were not shown because too many files have changed in this diff Show More