mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-08-18 11:10:02 +00:00
Code Issues Projects Releases Wiki Activity

Allow users to add contacts to Shared Groups.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@4723 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-07-31 20:25:13 +00:00
committed by derek
parent a73ae60224
commit 7d556f4418
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/jivesoftware/spark/ui/ContactList.java
View File

@ -1104,9 +1104,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
final JPopupMenu popup = new JPopupMenu();
if (!group.isSharedGroup()) {
popup.add(addContactMenu);
}
popup.add(addContactMenu);
popup.add(addContactGroupMenu);
popup.addSeparator();
@ -1956,7 +1954,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
retryPanel.setDisconnectReason(message);
if (!conflict) {
if (false) {
retryPanel.startTimer();
}
else {

2
src/java/org/jivesoftware/spark/ui/RetryPanel.java
View File

@ -63,7 +63,7 @@ public class RetryPanel extends JPanel {
descriptionLabel = new WrappedLabel();
retryButton = new RolloverButton(SparkRes.getImageIcon(SparkRes.SMALL_CHECK));
cancelButton = new RolloverButton("Cancel", SparkRes.getImageIcon(SparkRes.SMALL_CIRCLE_DELETE));
cancelButton = new RolloverButton("Log Out", SparkRes.getImageIcon(SparkRes.SMALL_CIRCLE_DELETE));
layoutComponents();

4
src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java
View File

@ -81,7 +81,7 @@ public class BroadcastPlugin implements Plugin, PacketListener {
// Register with action menu
JMenuItem startConversationtMenu = new JMenuItem("", SparkRes.getImageIcon(SparkRes.SMALL_MESSAGE_IMAGE));
ResourceUtils.resButton(startConversationtMenu, "&Start Conversation");
ResourceUtils.resButton(startConversationtMenu, "&Start Chat");
actionsMenu.add(startConversationtMenu);
startConversationtMenu.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@ -94,7 +94,7 @@ public class BroadcastPlugin implements Plugin, PacketListener {
selectedUser = contactItem.getFullJID();
}
String jid = (String)JOptionPane.showInputDialog(SparkManager.getMainWindow(), "Enter Address", "Start Conversation", JOptionPane.QUESTION_MESSAGE, null, null, selectedUser);
String jid = (String)JOptionPane.showInputDialog(SparkManager.getMainWindow(), "Enter Address", "Start Chat", JOptionPane.QUESTION_MESSAGE, null, null, selectedUser);
if (ModelUtil.hasLength(jid) && ModelUtil.hasLength(StringUtils.parseServer(jid))) {
if (ModelUtil.hasLength(jid) && jid.indexOf('@') == -1) {
// Append server address

2
src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
View File

@ -17,7 +17,7 @@ public class JiveInfo {
}
public static String getVersion() {
return "1.1.9.4";
return "1.1.9.5";
}
public static String getOS() {