Update Theme work.

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@6111 b35dd754-fafc-0310-a699-88a17e54d16e

build/installer/spark.aip

@@ -5,15 +5,13 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPPRODUCTICON" Value="controlPanelIcon.exe"/>
     <ROW Property="ARPURLINFOABOUT" Value="http://www.jivesoftware.org/spark"/>
-    <ROW Property="BannerBitmap" Value="style2blue_banner.jpg" Type="1"/>
+    <ROW Property="BannerBitmap" Value="default_banner.bmp" Type="1"/>
-    <ROW Property="CTRLS" Value="2"/>
+    <ROW Property="DialogBitmap" Value="default_dialog.bmp" Type="1"/>
-    <ROW Property="DialogBitmap" Value="style2blue_dialog.jpg" Type="1"/>
     <ROW Property="Manufacturer" Value="Jive Software" ValueLocId="*"/>
     <ROW Property="ProductCode" Value="1033:{B68C7CBE-A77D-4CA3-9E78-2C3BF2B5A897} "/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Spark" ValueLocId="*"/>
     <ROW Property="ProductVersion" Value="2.0.5"/>
-    <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{FD8D7ADD-E933-4DEA-81BA-2F4C0FF8B22E}"/>
   </COMPONENT>
@@ -34,24 +32,16 @@
     <ROW Directory="windows_DIR" Directory_Parent="lib_DIR" DefaultDir="windows"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
-    <ROW Component="APPDIR" ComponentId="{846B8A6F-154D-4B59-BC3F-997826D65711}" Directory_="APPDIR" Attributes="0"/>
-    <ROW Component="DellSupport" ComponentId="{2A003F7E-D1AD-4434-88FC-8B2D1C71262F}" Directory_="APPDIR" Attributes="4" KeyPath="DellSupport" FullKeyPath="HK_CU\Run\DellSupport"/>
-    <ROW Component="DellSupport_1" ComponentId="{D2786D68-0F93-45FF-8CDA-6F7239D857CD}" Directory_="APPDIR" Attributes="4" KeyPath="DellSupport_1" FullKeyPath="HK_UM\Software\Run\DellSupport"/>
     <ROW Component="IeEmbed.exe" ComponentId="{2552E216-7836-4ED2-8676-8F0DAC7CFBE4}" Directory_="windows_DIR" Attributes="0" KeyPath="IeEmbed.exe" FullKeyPath="APPDIR\lib\windows\IeEmbed.exe"/>
     <ROW Component="Info.plist" ComponentId="{DFF8C4AC-6AF8-48D8-8960-7D2930A4B487}" Directory_="resources_DIR" Attributes="0" KeyPath="Info.plist" FullKeyPath="APPDIR\resources"/>
     <ROW Component="MozEmbed.exe" ComponentId="{80FB601E-4D1E-47CC-8900-72DAF42B0771}" Directory_="windows_DIR" Attributes="0" KeyPath="MozEmbed.exe" FullKeyPath="APPDIR\lib\windows\MozEmbed.exe"/>
-    <ROW Component="MsnMsgr" ComponentId="{09DC89A4-AA56-4800-BA0B-C5AC6C37DB99}" Directory_="APPDIR" Attributes="4" KeyPath="MsnMsgr" FullKeyPath="HK_CU\Run\MsnMsgr"/>
-    <ROW Component="MsnMsgr_1" ComponentId="{4891BA95-02B4-427F-B9FE-0F2926728297}" Directory_="APPDIR" Attributes="4" KeyPath="MsnMsgr_1" FullKeyPath="HK_UM\Software\Run\MsnMsgr"/>
     <ROW Component="Spark" ComponentId="{EBD3450E-80F9-4F19-9AC6-A3750F7BD93B}" Directory_="APPDIR" Attributes="4" KeyPath="Spark" FullKeyPath="HK_UM\Software\Spark"/>
     <ROW Component="Spark.exe" ComponentId="{64B04163-3A7C-4F9F-9F72-2E2FEDB7FE4D}" Directory_="APPDIR" Attributes="0" KeyPath="Spark.exe" FullKeyPath="APPDIR\Spark.exe"/>
-    <ROW Component="Spark_1" ComponentId="{E702163D-2F26-4D0D-8419-FE32DBED2FC3}" Directory_="APPDIR" Attributes="4" KeyPath="Spark_1" FullKeyPath="HK_UM\Software\Run\Spark"/>
     <ROW Component="Your_Product.exe" ComponentId="{0CCEE694-7AA5-4D78-BA82-A5001AF3489F}" Directory_="APPDIR" Attributes="0" KeyPath="Your_Product.exe" FullKeyPath="APPDIR\starter.exe"/>
     <ROW Component="activation.jar" ComponentId="{4AA0D33E-9C25-4CA7-8C10-4CE4FBF116A0}" Directory_="lib_DIR" Attributes="0" KeyPath="activation.jar" FullKeyPath="APPDIR\lib"/>
     <ROW Component="banner_spark.gif" ComponentId="{73562780-810A-49E3-B2D2-F77E2C2F837E}" Directory_="images_DIR" Attributes="0" KeyPath="banner_spark.gif" FullKeyPath="APPDIR\documentation\images"/>
     <ROW Component="bell.wav" ComponentId="{EF2B5A55-1F75-4FD9-AA4A-D74E2E68E693}" Directory_="sounds_DIR" Attributes="0" KeyPath="bell.wav" FullKeyPath="APPDIR\resources\sounds"/>
     <ROW Component="builder.jar" ComponentId="{795A80F8-B5ED-4AD1-936D-C899D0372A3D}" Directory_="documentation_DIR" Attributes="0" KeyPath="builder.jar" FullKeyPath="APPDIR\documentation"/>
-    <ROW Component="ctfmon.exe" ComponentId="{462D3330-8845-4801-9ABD-A88B0837C790}" Directory_="APPDIR" Attributes="4" KeyPath="ctfmon.exe" FullKeyPath="HK_CU\Run\ctfmon.exe"/>
-    <ROW Component="ctfmon.exe_1" ComponentId="{98880385-19A4-4A17-88D7-75582C9C245F}" Directory_="APPDIR" Attributes="4" KeyPath="ctfmon.exe_1" FullKeyPath="HK_UM\Software\Run\ctfmon.exe"/>
     <ROW Component="error.log" ComponentId="{70AD4F3B-9CDF-4026-AA4D-5F36707989ED}" Directory_="logs_DIR" Attributes="0" KeyPath="error.log" FullKeyPath="APPDIR\logs"/>
     <ROW Component="fastpath.jar" ComponentId="{503F9197-8958-4BEC-822A-94E0E6E1D4C4}" Directory_="plugins_DIR" Attributes="0" KeyPath="fastpath.jar" FullKeyPath="APPDIR\plugins"/>
     <ROW Component="jdic.dll" ComponentId="{17D3EE65-D6C1-467E-B25A-676C0EEFAD93}" Directory_="windows_DIR" Attributes="0" KeyPath="jdic.dll" FullKeyPath="APPDIR\lib\windows\jdic.dll"/>
@@ -63,7 +53,7 @@
     <ROW Component="tray.dll" ComponentId="{9111ECAE-92BB-4C1C-BFBF-BF4A76C93CC1}" Directory_="windows_DIR" Attributes="0" KeyPath="tray.dll" FullKeyPath="APPDIR\lib\windows\tray.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="startup.bat builder.jar banner_spark.gif activation.jar IeEmbed.exe jdic.dll jdic.jar MozEmbed.exe tray.dll error.log fastpath.jar Info.plist jniwrap.dll bell.wav systeminfo.dll Spark.exe jdic.jar_1 Your_Product.exe APPDIR DellSupport ctfmon.exe MsnMsgr Spark DellSupport_1 ctfmon.exe_1 MsnMsgr_1 Spark_1"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="startup.bat builder.jar banner_spark.gif activation.jar IeEmbed.exe jdic.dll jdic.jar MozEmbed.exe tray.dll error.log fastpath.jar Info.plist jniwrap.dll bell.wav systeminfo.dll Spark.exe jdic.jar_1 Your_Product.exe Spark"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@@ -130,9 +120,9 @@
     <ROW Fragment="UI.aip" Path="&lt;UI.aip&gt;"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
+    <ROW Name="default_banner.bmp" SourcePath="&lt;default-banner.bmp&gt;"/>
+    <ROW Name="default_dialog.bmp" SourcePath="&lt;default-dialog.bmp&gt;"/>
     <ROW Name="launcher.dll" SourcePath="&lt;launcher.dll&gt;"/>
-    <ROW Name="style2blue_banner.jpg" SourcePath="&lt;style2blue-banner.jpg&gt;"/>
-    <ROW Name="style2blue_dialog.jpg" SourcePath="&lt;style2blue-dialog.jpg&gt;"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiControlComponent">
     <ATTRIBUTE name="FixedSizeBitmaps" value="0"/>
@@ -147,12 +137,8 @@
     <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="1"/>
     <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="3"/>
   </COMPONENT>
-  <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
-    <ROW Directory_="APPDIR" Component_="APPDIR"/>
-  </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
-    <ROW Action="AI_LaunchApp" Type="1" Source="launcher.dll" Target="[#Spark.exe]"/>
     <ROW Action="AI_PREPARE_UPGRADE" Type="1" Source="launcher.dll" Target="PrepareUpgrade"/>
     <ROW Action="AI_RESTORE_LOCATION" Type="1" Source="launcher.dll" Target="RestoreLocation"/>
     <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
@@ -209,23 +195,16 @@
     <ATTRIBUTE name="FirstMediaSize" value="0"/>
     <ATTRIBUTE name="FirstMediaSizeUnit" value="0"/>
     <ATTRIBUTE name="InstallationType" value="0"/>
+    <ATTRIBUTE name="JREPath" value="..\..\..\..\Program Files\Java\jre1.5.0_06"/>
     <ATTRIBUTE name="MediaSize" value="0"/>
     <ATTRIBUTE name="MediaSizeUnit" value="0"/>
     <ATTRIBUTE name="Package" value="1"/>
-    <ATTRIBUTE name="PackageName" value="..\..\..\..\spark"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
-    <ROW Registry="DellSupport" Root="1" Key="Run" Name="DellSupport" Value="&quot;C:\Program Files\Dell Support\DSAgnt.exe&quot; /startup" Component_="DellSupport"/>
-    <ROW Registry="DellSupport_1" Root="-1" Key="Software\Run" Name="DellSupport" Value="&quot;C:\Program Files\Dell Support\DSAgnt.exe&quot; /startup" Component_="DellSupport_1"/>
-    <ROW Registry="MsnMsgr" Root="1" Key="Run" Name="MsnMsgr" Value="&quot;C:\Program Files\MSN Messenger\MsnMsgr.Exe&quot; /background" Component_="MsnMsgr"/>
-    <ROW Registry="MsnMsgr_1" Root="-1" Key="Software\Run" Name="MsnMsgr" Value="&quot;C:\Program Files\MSN Messenger\MsnMsgr.Exe&quot; /background" Component_="MsnMsgr_1"/>
     <ROW Registry="Spark" Root="-1" Key="Software" Name="Spark" Value="[#Spark.exe]" Component_="Spark"/>
-    <ROW Registry="Spark_1" Root="-1" Key="Software\Run" Name="Spark" Value="[#Spark.exe]" Component_="Spark_1"/>
-    <ROW Registry="ctfmon.exe" Root="1" Key="Run" Name="ctfmon.exe" Value="C:\WINDOWS\system32\ctfmon.exe" Component_="ctfmon.exe"/>
-    <ROW Registry="ctfmon.exe_1" Root="-1" Key="Software\Run" Name="ctfmon.exe" Value="C:\WINDOWS\system32\ctfmon.exe" Component_="ctfmon.exe_1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
-    <ROW Shortcut="Spark.exe" Directory_="SHORTCUTDIR" Name="Spark.exe" Component_="Spark.exe" Target="[#Spark.exe]" Description="Spark.exe" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
+    <ROW Shortcut="Spark.exe" Directory_="SHORTCUTDIR" Name="Spark" Component_="Spark.exe" Target="[#Spark.exe]" Description="Spark.exe" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
     <ROW Shortcut="Spark.exe_1" Directory_="DesktopFolder" Name="Spark.exe" Component_="Spark.exe" Target="[#Spark.exe]" Description="Spark.exe" Hotkey="0" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">

build/projects/Spark.ipr

@@ -405,7 +405,7 @@
       <module fileurl="file://$PROJECT_DIR$/Spark.iml" filepath="$PROJECT_DIR$/Spark.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 (1)" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="JDK 1.5.0" project-jdk-type="JavaSDK" />
   <component name="ProjectRunConfigurationManager" />
   <component name="RmicSettings">
     <option name="IS_EANABLED" value="false" />

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);

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);

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);
+        */
     }
 
     /**

src/java/org/jivesoftware/spark/ui/TranscriptWindow.java

@@ -121,8 +121,9 @@ public class TranscriptWindow extends JPanel {
             }
         });
 
-
+        final JScrollPane pane = new JScrollPane(browser);
-        add(new JScrollPane(browser), BorderLayout.CENTER);
+        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);
+                        browser.executeScript(script);
-                        String str = browser.executeScript(script);
-                        //   System.out.println(str);
                     }
                 }
             }

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;
     }
 

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));