General group chat UI enhancements.

resources/colors/colors.properties

@@ -134,10 +134,11 @@ contactListGroupRowColor=C2CEE0
 contactListGroupGradientColor=C2CEE0
 
 # Main window background color.
+
 mainWindowBackground=FAFAFA
 
-# Background color of the toolbar button when selected.
-toolbarBackground=414141
+# Tooltip background color.
+tooltipBackground=E8E9EF
 
 # Rollover color for the toolbar button.
 toolbarRolloverBackground=414141
@@ -146,7 +147,8 @@ toolbarRolloverBackground=414141
 contactListContactForeground=000000
 
 # Contactlist group text foreground color.
+
 contactListGroupForeground=000000
 
 # Tooltip background.
-tooltipBackground=e8e9ef
+tooltipBackground=e8e9ef

resources/languages/resources.properties

@@ -178,8 +178,9 @@ invitation=Invitation text
 invitationReceived=Invitation received
 invitationReceivedFormInfo={0} has invited you to join {1} chat room. You could accept, reject or ignore this invitation.
 invite=&Invite
-inviteContactFormInfo=Please write the name of the user you would like to invite. If you wish you could also precise the reason for this invitation.
+inviteContactFormInfo=Select the names of the contacts you would like to add to this conversation and then click Invite.
 inviteContactToChat=Invite contact to chat
+inviteReason=Invite reason
 isCalling=is calling...
 join=&Join
 joinAs=J&oin as

src/net/java/sip/communicator/impl/gui/DefaultContactEventHandler.java

@@ -88,10 +88,10 @@ public RunMessageWindow(MetaContact metaContact,
          */
         public void run()
         {
-            MetaContactChatPanel chatPanel;
+            ChatPanel chatPanel;
 
             ChatWindowManager chatWindowManager
-                = mainFrame.getChatWindowManager();
+                = GuiActivator.getUIService().getChatWindowManager();
 
             chatPanel = chatWindowManager
                     .getContactChat(metaContact, protocolContact);

src/net/java/sip/communicator/impl/gui/UIServiceImpl.java

@@ -20,6 +20,7 @@
 import net.java.sip.communicator.impl.gui.main.account.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
+import net.java.sip.communicator.impl.gui.main.chat.history.*;
 import net.java.sip.communicator.impl.gui.main.configforms.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
 import net.java.sip.communicator.impl.gui.main.login.*;
@@ -31,10 +32,10 @@
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
-import com.sun.jna.examples.*;
-
 import org.osgi.framework.*;
 
+import com.sun.jna.examples.*;
+
 /**
  * An implementation of the <tt>UIService</tt> that gives access to other
  * bundles to this particular swing ui implementation.
@@ -79,8 +80,17 @@ public class UIServiceImpl
 
     private LoginManager loginManager;
 
+    private ChatWindowManager chatWindowManager
+        = new ChatWindowManager();
+
+    private ConferenceChatManager conferenceChatManager
+        = new ConferenceChatManager();
+
     private ConfigurationFrame configurationFrame;
 
+    private HistoryWindowManager historyWindowManager
+        = new HistoryWindowManager();
+
     private boolean exitOnClose = true;
 
     /**
@@ -524,14 +534,12 @@ public PopupDialog getPopupDialog()
      *
      * @see UIService#getChat(Contact)
      */
-    public Chat getChat(Contact contact)
+    public ChatPanel getChat(Contact contact)
     {
         MetaContact metaContact = mainFrame.getContactList()
             .findMetaContactByContact(contact);
 
-        ChatWindowManager chatWindowManager = mainFrame.getChatWindowManager();
-
-        MetaContactChatPanel chatPanel
+        ChatPanel chatPanel
             = chatWindowManager.getContactChat(metaContact);
 
         return chatPanel;
@@ -544,11 +552,9 @@ public Chat getChat(Contact contact)
      * about.
      * @return the <tt>Chat</tt> corresponding to the given <tt>ChatRoom</tt>.
      */
-    public Chat getChat(ChatRoom chatRoom)
+    public ChatPanel getChat(ChatRoom chatRoom)
     {
-        ChatWindowManager chatWindowManager = mainFrame.getChatWindowManager();
-
-        ConferenceChatPanel chatPanel
+        ChatPanel chatPanel
             = chatWindowManager.getMultiChat(chatRoom);
 
         return chatPanel;
@@ -559,10 +565,8 @@ public Chat getChat(ChatRoom chatRoom)
      *
      * @return the selected <tt>Chat</tt>.
      */
-    public Chat getCurrentChat()
+    public ChatPanel getCurrentChat()
     {
-        ChatWindowManager chatWindowManager = mainFrame.getChatWindowManager();
-
         return chatWindowManager.getSelectedChat();
     }
 
@@ -654,6 +658,35 @@ public LoginManager getLoginManager()
         return loginManager;
     }
 
+    /**
+     * Returns the chat conference manager.
+     * 
+     * @return the chat conference manager.
+     */
+    public ConferenceChatManager getConferenceChatManager()
+    {
+        return conferenceChatManager;
+    }
+
+    /**
+     * Returns the chat window manager.
+     * 
+     * @return the chat window manager.
+     */
+    public ChatWindowManager getChatWindowManager()
+    {
+        return chatWindowManager;
+    }
+
+    /**
+     * Returns the <tt>HistoryWindowManager</tt>.
+     * @return the <tt>HistoryWindowManager</tt>
+     */
+    public HistoryWindowManager getHistoryWindowManager()
+    {
+        return historyWindowManager;
+    }
+
     /**
      * Returns the <tt>MainFrame</tt>. This is the class defining the main
      * application window.