mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Updating for secret 3.0 pre-alpha release.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@6338 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-12-08 06:32:46 +00:00
committed by derek
parent 6e51ebe169
commit e5b8755e61
8 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/lib/dist/skinlf.jar vendored
View File

Binary file not shown.

22
build/projects/Spark.iml
View File

@ -187,7 +187,9 @@
<root url="jar://$MODULE_DIR$/../lib/dist/smack.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
<SOURCES>
<root url="jar://$MODULE_DIR$/../lib/dist/customskin.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@ -199,15 +201,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/dist/skinlf.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -235,6 +228,15 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/dist/skinlf.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">

35
src/java/org/jivesoftware/spark/ui/ChatRoomButton.java
View File

@ -10,6 +10,8 @@
package org.jivesoftware.spark.ui;
import org.jivesoftware.spark.component.RolloverButton;
import javax.swing.Icon;
import javax.swing.JButton;
@ -20,13 +22,12 @@ import java.awt.event.MouseEvent;
/**
* Button to use with ChatRooms to allow for conformity in the Chat Room look and feel.
*/
public class ChatRoomButton extends JButton {
public class ChatRoomButton extends RolloverButton {
/**
* Create a new ChatRoomButton.
*/
public ChatRoomButton() {
decorate();
}
/**
@ -36,7 +37,6 @@ public class ChatRoomButton extends JButton {
*/
public ChatRoomButton(Icon icon) {
super(icon);
decorate();
}
/**
@ -47,7 +47,6 @@ public class ChatRoomButton extends JButton {
*/
public ChatRoomButton(String text, Icon icon) {
super(text, icon);
decorate();
}
/**
@ -58,38 +57,10 @@ public class ChatRoomButton extends JButton {
public ChatRoomButton(String text) {
super(text);
decorate();
}
/**
* Decorates the button with the approriate UI configurations.
*/
private void decorate() {
setBorderPainted(false);
setOpaque(true);
setContentAreaFilled(false);
setMargin(new Insets(0, 0, 0, 0));
addMouseListener(new MouseAdapter() {
public void mouseEntered(MouseEvent e) {
if (isEnabled()) {
setBorderPainted(true);
setContentAreaFilled(true);
}
}
public void mouseExited(MouseEvent e) {
setBorderPainted(false);
setContentAreaFilled(false);
}
});
setVerticalTextPosition(JButton.BOTTOM);
setHorizontalTextPosition(JButton.CENTER);
setIconTextGap(2);
}
}

28
src/java/org/jivesoftware/spark/ui/TranscriptWindow.java
View File

@ -14,6 +14,8 @@ import com.webrenderer.BrowserFactory;
import com.webrenderer.IBrowserCanvas;
import com.webrenderer.event.MouseEvent;
import com.webrenderer.event.MouseListener;
import com.webrenderer.event.NetworkEvent;
import com.webrenderer.event.NetworkListener;
import org.jivesoftware.Spark;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.util.StringUtils;
@ -93,7 +95,33 @@ public class TranscriptWindow extends JPanel {
//Core function to create browser
browser = BrowserFactory.spawnMozilla();
browser.addNetworkListener(new NetworkListener() {
public void onProgressChange(NetworkEvent networkEvent) {
}
public void onDocumentLoad(NetworkEvent networkEvent) {
documentLoaded = true;
}
public void onDocumentComplete(NetworkEvent networkEvent) {
}
public void onNetworkStatus(NetworkEvent networkEvent) {
}
public void onNetworkError(NetworkEvent networkEvent) {
}
public void onHTTPResponse(NetworkEvent networkEvent) {
}
public void onHTTPInterceptHeaders(NetworkEvent networkEvent) {
}
});
browser.loadURL(themeManager.getTemplateURL());
documentLoaded = true;
browser.enableDefaultContextMenu(false);

7
src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
View File

@ -32,13 +32,10 @@ import org.jivesoftware.spark.ui.ContactItem;
import org.jivesoftware.spark.ui.ContactList;
import org.jivesoftware.spark.ui.MessageEventListener;
import org.jivesoftware.spark.ui.RosterDialog;
import org.jivesoftware.spark.ui.VCardPanel;
import org.jivesoftware.spark.util.ModelUtil;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.profile.VCardManager;
import java.awt.GridBagConstraints;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.text.SimpleDateFormat;
@ -185,10 +182,6 @@ public class ChatRoomImpl extends ChatRoom {
typingTimer.start();
lastActivity = System.currentTimeMillis();
// Add VCard Panel
final VCardPanel vcardPanel = new VCardPanel(participantJID);
getToolBar().add(vcardPanel, new GridBagConstraints(0, 1, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0));
}

12
src/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/SendMessage.java
View File

@ -72,18 +72,18 @@ public class SendMessage extends JPanel {
setLayout(new GridBagLayout());
setBackground(new Color(250, 249, 242));
add(imageLabel, new GridBagConstraints(0, 0, 1, 3, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
add(imageLabel, new GridBagConstraints(0, 0, 1, 3, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
add(titleLabel, new GridBagConstraints(1, 0, 2, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
add(titleLabel, new GridBagConstraints(1, 0, 2, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
titleLabel.setFont(new Font("Dialog", Font.BOLD, 11));
titleLabel.setForeground(new Color(211, 174, 102));
add(fileLabel, new GridBagConstraints(1, 1, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 5, 5), 0, 0));
add(fileLabel, new GridBagConstraints(1, 1, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 2, 2, 2), 0, 0));
cancelButton.setText(Res.getString("cancel"));
retryButton.setText(Res.getString("retry"));
add(cancelButton, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 0, 5), 0, 0));
add(retryButton, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 0, 5), 0, 0));
add(cancelButton, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 2, 0, 2), 0, 0));
add(retryButton, new GridBagConstraints(1, 3, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 2, 0, 2), 0, 0));
retryButton.setVisible(false);
retryButton.addActionListener(new ActionListener() {
@ -173,7 +173,7 @@ public class SendMessage extends JPanel {
progressBar.setMaximum((int)fileSize);
progressBar.setVisible(false);
progressBar.setStringPainted(true);
add(progressBar, new GridBagConstraints(1, 2, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 5, 0, 5), 150, 0));
add(progressBar, new GridBagConstraints(1, 2, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 2, 0, 2), 150, 0));
SwingWorker worker = new SwingWorker() {

BIN
src/xtra/themes/Default.zip
View File

Binary file not shown.

BIN
src/xtra/themes/Renkoo.zip
View File

Binary file not shown.