diff options
6 files changed, 41 insertions, 9 deletions
diff --git a/Plugins/emoticons/MepEditor/JarDescription.jardesc b/Plugins/emoticons/MepEditor/JarDescription.jardesc index ce47ff8..42d7365 100644 --- a/Plugins/emoticons/MepEditor/JarDescription.jardesc +++ b/Plugins/emoticons/MepEditor/JarDescription.jardesc @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<jardesc>
- <jar path="C:/Desenvolvimento/Java/MepEditor/ZIP/MepEditor.jar"/>
+ <jar path="C:/Desenvolvimento/Miranda/plugins/emoticons/MepEditor/ZIP/MepEditor.jar"/>
<options buildIfNeeded="true" compress="true" descriptionLocation="/MepEditor/JarDescription.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
<storedRefactorings deprecationInfo="true" structuralOnly="false"/>
<selectedProjects/>
@@ -13,4 +13,5 @@ <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
<javaElement handleIdentifier="=MepEditor/src"/>
</selectedElements>
+ <fatjar builder="org.eclipse.jdt.ui.plain_jar_builder" launchConfig=""/>
</jardesc>
diff --git a/Plugins/emoticons/MepEditor/src/emoticons/EmoFormat.java b/Plugins/emoticons/MepEditor/src/emoticons/EmoFormat.java index 0310e8d..29bef34 100644 --- a/Plugins/emoticons/MepEditor/src/emoticons/EmoFormat.java +++ b/Plugins/emoticons/MepEditor/src/emoticons/EmoFormat.java @@ -46,7 +46,13 @@ public class EmoFormat String name = removeSeparators(line.substring(0, pos));
Emoticon emoticon = getEmoticon(name);
- emoticon.icons.put(protocol, new EmoticonImage());
+
+ String description = null;
+ int endPos = line.indexOf(',', pos + 1);
+ if (endPos >= 0)
+ description = removeSeparators(line.substring(pos + 1, endPos));
+
+ emoticon.icons.put(protocol, new EmoticonImage(description));
}
}
catch (IOException e)
diff --git a/Plugins/emoticons/MepEditor/src/emoticons/Emoticon.java b/Plugins/emoticons/MepEditor/src/emoticons/Emoticon.java index f0470d1..02684fe 100644 --- a/Plugins/emoticons/MepEditor/src/emoticons/Emoticon.java +++ b/Plugins/emoticons/MepEditor/src/emoticons/Emoticon.java @@ -1,4 +1,5 @@ package emoticons;
+
import java.util.HashMap;
import java.util.Map;
diff --git a/Plugins/emoticons/MepEditor/src/emoticons/EmoticonImage.java b/Plugins/emoticons/MepEditor/src/emoticons/EmoticonImage.java index 9b6bcd5..6c246a5 100644 --- a/Plugins/emoticons/MepEditor/src/emoticons/EmoticonImage.java +++ b/Plugins/emoticons/MepEditor/src/emoticons/EmoticonImage.java @@ -2,5 +2,15 @@ package emoticons; public class EmoticonImage
{
+ String description;
ImageFile image;
+
+ public EmoticonImage(String description)
+ {
+ this.description = description;
+ }
+
+ public EmoticonImage()
+ {
+ }
}
diff --git a/Plugins/emoticons/MepEditor/src/emoticons/MepEditor.java b/Plugins/emoticons/MepEditor/src/emoticons/MepEditor.java index c7f3910..2003452 100644 --- a/Plugins/emoticons/MepEditor/src/emoticons/MepEditor.java +++ b/Plugins/emoticons/MepEditor/src/emoticons/MepEditor.java @@ -187,7 +187,7 @@ public class MepEditor if (icon == null)
continue;
- createEmoticonNameLabel(emoticonsComposite, emo);
+ createEmoticonNameLabel(emoticonsComposite, emo, icon);
createIconCombo(icon, emoticonsComposite, emo, protocol);
createFramesHolder(emo, icon, emoticonsComposite);
@@ -209,7 +209,7 @@ public class MepEditor emoticonsScroll.setMinSize(emoticonsComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT, false));
}
- private static void createEmoticonNameLabel(final Composite parent, final Emoticon emo)
+ private static void createEmoticonNameLabel(final Composite parent, final Emoticon emo, EmoticonImage icon)
{
File defImage = new File("data/Defaults/" + emo.name + ".png");
if (defImage.exists())
@@ -217,14 +217,25 @@ public class MepEditor Label label = new Label(parent, SWT.NONE);
label.setLayoutData(gridData(1, 2));
label.setImage(Images.get(defImage));
- createBoldLabel(parent, emo.name, gridData(1, 2));
+
+ createBoldLabel(parent, getEmoLabelText(emo, icon), gridData(1, 2));
}
else
{
- createBoldLabel(parent, emo.name, gridData(2, 2));
+ createBoldLabel(parent, getEmoLabelText(emo, icon), gridData(2, 2));
}
}
+ private static String getEmoLabelText(final Emoticon emo, EmoticonImage icon)
+ {
+ if (icon.description == null)
+ return emo.name;
+ if (icon.description.equalsIgnoreCase(emo.name))
+ return icon.description;
+
+ return icon.description + "\n[" + emo.name + "]";
+ }
+
private static void createProtoCombo(final Composite parent, String protocol, final Composite main, final Group group)
{
final Combo protoCombo = new Combo(parent, SWT.READ_ONLY);
@@ -341,8 +352,11 @@ public class MepEditor delayedListeners.remove(this);
((Control) event.widget).setBackground(bkg);
listener.handleEvent(event);
- color.dispose();
- color = null;
+ if (color != null)
+ {
+ color.dispose();
+ color = null;
+ }
}
private void start(Event e)
diff --git a/Plugins/emoticons/MepEditor/src/emoticons/MepFormat.java b/Plugins/emoticons/MepEditor/src/emoticons/MepFormat.java index e22d5d4..690ad7d 100644 --- a/Plugins/emoticons/MepEditor/src/emoticons/MepFormat.java +++ b/Plugins/emoticons/MepEditor/src/emoticons/MepFormat.java @@ -215,7 +215,7 @@ public class MepFormat public void save() throws IOException
{
mep.path.mkdirs();
- FileWriter out = new FileWriter(new File(mep.path, mep.path.getName() + ".mep"));
+ FileWriter out = new FileWriter(new File(mep.path, mep.path.getName() + ".mep"), false);
if (!mep.name.isEmpty() && !mep.name.equals(mep.path.getName()))
out.write("Name: " + mep.name + "\r\n");
|