diff --git a/build/installer/spark.aip b/build/installer/spark.aip
index c7b35560..5d068341 100644
--- a/build/installer/spark.aip
+++ b/build/installer/spark.aip
@@ -5,15 +5,13 @@
|
|
|
- |
- |
- |
+ |
+ |
|
|
|
|
|
- |
|
|
@@ -34,24 +32,16 @@
|
- |
- |
- |
|
|
|
- |
- |
|
|
- |
|
|
|
|
|
- |
- |
|
|
|
@@ -63,7 +53,7 @@
|
- |
+ |
@@ -130,9 +120,9 @@
|
+ |
+ |
|
- |
- |
@@ -147,12 +137,8 @@
|
|
-
- |
-
|
- |
|
|
|
@@ -209,23 +195,16 @@
+
-
- |
- |
- |
- |
|
- |
- |
- |
- |
+ |
|
diff --git a/build/lib/dist/smack.jar b/build/lib/dist/smack.jar
index a2b278e2..62cdd1f4 100644
Binary files a/build/lib/dist/smack.jar and b/build/lib/dist/smack.jar differ
diff --git a/build/lib/dist/smackx-debug.jar b/build/lib/dist/smackx-debug.jar
index 075aba97..4022e5dc 100644
Binary files a/build/lib/dist/smackx-debug.jar and b/build/lib/dist/smackx-debug.jar differ
diff --git a/build/lib/dist/smackx.jar b/build/lib/dist/smackx.jar
index 56332dad..55e7ef36 100644
Binary files a/build/lib/dist/smackx.jar and b/build/lib/dist/smackx.jar differ
diff --git a/build/projects/Spark.ipr b/build/projects/Spark.ipr
index a3b97d64..d70acec3 100644
--- a/build/projects/Spark.ipr
+++ b/build/projects/Spark.ipr
@@ -405,7 +405,7 @@
-
+
diff --git a/src/commercial/jniwrapper.jar b/src/commercial/jniwrapper.jar
index 1dfbb25c..a9203856 100644
Binary files a/src/commercial/jniwrapper.jar and b/src/commercial/jniwrapper.jar differ
diff --git a/src/java/org/jivesoftware/spark/ui/ChatContainer.java b/src/java/org/jivesoftware/spark/ui/ChatContainer.java
index 85cb0540..a10c28e6 100644
--- a/src/java/org/jivesoftware/spark/ui/ChatContainer.java
+++ b/src/java/org/jivesoftware/spark/ui/ChatContainer.java
@@ -1105,7 +1105,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
SwingWorker worker = new SwingWorker() {
public Object construct() {
try {
- Thread.sleep(50);
+ Thread.sleep(1000);
}
catch (InterruptedException e1) {
Log.error(e1);
diff --git a/src/java/org/jivesoftware/spark/ui/ChatRoom.java b/src/java/org/jivesoftware/spark/ui/ChatRoom.java
index 6a11cc29..9a9f6bed 100644
--- a/src/java/org/jivesoftware/spark/ui/ChatRoom.java
+++ b/src/java/org/jivesoftware/spark/ui/ChatRoom.java
@@ -204,7 +204,7 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener
verticalSplit.setTopComponent(chatPanel);
verticalSplit.setBottomComponent(bottomPanel);
verticalSplit.setResizeWeight(1.0);
- verticalSplit.setDividerSize(2);
+ verticalSplit.setDividerSize(1);
// Add listener to send button
chatAreaButton.getButton().addActionListener(this);
diff --git a/src/java/org/jivesoftware/spark/ui/ContactGroup.java b/src/java/org/jivesoftware/spark/ui/ContactGroup.java
index aeaa1be8..6256c266 100644
--- a/src/java/org/jivesoftware/spark/ui/ContactGroup.java
+++ b/src/java/org/jivesoftware/spark/ui/ContactGroup.java
@@ -146,10 +146,12 @@ public class ContactGroup extends CollapsiblePane implements MouseListener {
addPopupWindow();
// Use background image
+ /*
URL url = getClass().getResource("/images/blue-steel-background.png");
ImageIcon icon = new ImageIcon(url);
getTitlePane().useImageAsBackground(icon.getImage());
getTitlePane().setTitleColor(Color.white);
+ */
}
/**
diff --git a/src/java/org/jivesoftware/spark/ui/TranscriptWindow.java b/src/java/org/jivesoftware/spark/ui/TranscriptWindow.java
index c312a562..d880ab8d 100644
--- a/src/java/org/jivesoftware/spark/ui/TranscriptWindow.java
+++ b/src/java/org/jivesoftware/spark/ui/TranscriptWindow.java
@@ -121,8 +121,9 @@ public class TranscriptWindow extends JPanel {
}
});
-
- add(new JScrollPane(browser), BorderLayout.CENTER);
+ final JScrollPane pane = new JScrollPane(browser);
+ pane.setBorder(null);
+ add(pane, BorderLayout.CENTER);
extraPanel.setBackground(Color.white);
extraPanel.setLayout(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 0, true, false));
@@ -130,6 +131,10 @@ public class TranscriptWindow extends JPanel {
add(extraPanel, BorderLayout.SOUTH);
startCommandListener();
+
+ browser.setFocusable(false);
+ this.setFocusable(false);
+ setBorder(null);
}
@@ -469,9 +474,7 @@ public class TranscriptWindow extends JPanel {
if (scriptList.size() > 0) {
String script = (String)scriptList.get(0);
scriptList.remove(0);
- System.out.println(script);
- String str = browser.executeScript(script);
- // System.out.println(str);
+ browser.executeScript(script);
}
}
}
diff --git a/src/java/org/jivesoftware/spark/ui/themes/ThemeManager.java b/src/java/org/jivesoftware/spark/ui/themes/ThemeManager.java
index 8bda2d28..fefd41d6 100644
--- a/src/java/org/jivesoftware/spark/ui/themes/ThemeManager.java
+++ b/src/java/org/jivesoftware/spark/ui/themes/ThemeManager.java
@@ -17,7 +17,6 @@ import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.util.StringUtils;
import org.jivesoftware.spark.util.URLFileSystem;
import org.jivesoftware.spark.util.log.Log;
-import org.jivesoftware.sparkimpl.plugin.emoticons.Emoticon;
import org.jivesoftware.sparkimpl.plugin.emoticons.EmoticonManager;
import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
@@ -34,7 +33,6 @@ import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Enumeration;
-import java.util.StringTokenizer;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.zip.ZipFile;
@@ -108,8 +106,10 @@ public class ThemeManager {
// Note that the install directory is my name for temporary files and
// not about mozilla. Me love Mozilla.
- be.setEnginePath("C:\\mozilla\\mozilla.exe");
+ //be.setEnginePath("C:\\mozilla\\mozilla.exe");
+ File mozilla = new File(Spark.getBinDirectory(), "mozilla");
+ be.setEnginePath(mozilla.getAbsolutePath());
THEMES_DIRECTORY = new File(Spark.getBinDirectory().getParent(), "xtra/themes").getAbsoluteFile();
// For Testing
@@ -328,6 +328,9 @@ public class ThemeManager {
public String getIncomingMessage(String sender, String time, String message, URL iconPath) {
String incoming = incomingText;
+ if (sender == null) {
+ sender = "";
+ }
incoming = incoming.replaceAll("%sender%", sender);
incoming = incoming.replaceAll("%time%", time);
incoming = incoming.replaceAll("%message%", message);
@@ -342,6 +345,9 @@ public class ThemeManager {
public String getIncomingHistoryMessage(String sender, String time, String message, URL iconPath) {
String incoming = incomingHistoryText;
+ if (sender == null) {
+ sender = "";
+ }
incoming = incoming.replaceAll("%sender%", sender);
incoming = incoming.replaceAll("%time%", time);
incoming = incoming.replaceAll("%message%", message);
@@ -356,6 +362,9 @@ public class ThemeManager {
public String getOutgoingMessage(String sender, String time, String message, URL iconPath) {
String outgoing = outgoingText;
+ if (sender == null) {
+ sender = "";
+ }
outgoing = outgoing.replaceAll("%sender%", sender);
outgoing = outgoing.replaceAll("%time%", time);
outgoing = outgoing.replaceAll("%message%", message);
@@ -369,6 +378,9 @@ public class ThemeManager {
public String getOutgoingHistoryMessage(String sender, String time, String message, URL iconPath) {
String outgoing = outgoingHistoryText;
+ if (sender == null) {
+ sender = "";
+ }
outgoing = outgoing.replaceAll("%sender%", sender);
outgoing = outgoing.replaceAll("%time%", time);
outgoing = outgoing.replaceAll("%message%", message);
@@ -476,7 +488,7 @@ public class ThemeManager {
String time = formatter.format(new Date());
text = text.replaceAll("%timeOpened", time);
-
+
return text;
}
diff --git a/src/java/org/jivesoftware/sparkimpl/preference/PreferencesPanel.java b/src/java/org/jivesoftware/sparkimpl/preference/PreferencesPanel.java
index 975046d6..be1808a5 100644
--- a/src/java/org/jivesoftware/sparkimpl/preference/PreferencesPanel.java
+++ b/src/java/org/jivesoftware/sparkimpl/preference/PreferencesPanel.java
@@ -51,7 +51,7 @@ public class PreferencesPanel extends JPanel implements ListSelectionListener {
scrollPane.setPreferredSize(new Dimension(125, 0));
list.setFixedCellHeight(70);
- add(scrollPane, new GridBagConstraints(0, 0, 1, 1, 0.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.VERTICAL, new Insets(5, 5, 5, 5), 30, 0));
+ add(scrollPane, new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 50, 0));
add(flowPanel, new GridBagConstraints(1, 0, 1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 0, 0));