Merge pull request #2529 from ddobrev/19520

Improvements to chat

interface/interface_en.ts

@@ -27,25 +27,25 @@
 <context>
     <name>ChatWindow</name>
     <message>
-        <location filename="ui/chatWindow.ui" line="20"/>
+        <location filename="ui/chatWindow.ui" line="29"/>
-        <location filename="../build/interface/ui_chatWindow.h" line="143"/>
+        <location filename="../build/interface/ui_chatWindow.h" line="153"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ui/chatWindow.ui" line="50"/>
+        <location filename="ui/chatWindow.ui" line="57"/>
-        <location filename="../build/interface/ui_chatWindow.h" line="144"/>
+        <location filename="../build/interface/ui_chatWindow.h" line="154"/>
         <source>Connecting to XMPP...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ui/chatWindow.ui" line="71"/>
+        <location filename="ui/chatWindow.ui" line="78"/>
-        <location filename="../build/interface/ui_chatWindow.h" line="145"/>
+        <location filename="../build/interface/ui_chatWindow.h" line="155"/>
         <source> online now:</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="128"/>
+        <location filename="src/ui/ChatWindow.cpp" line="135"/>
         <source>day</source>
         <translation>
             <numerusform>%n day</numerusform>
@@ -53,7 +53,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="128"/>
+        <location filename="src/ui/ChatWindow.cpp" line="135"/>
         <source>hour</source>
         <translation>
             <numerusform>%n hour</numerusform>
@@ -61,7 +61,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="128"/>
+        <location filename="src/ui/ChatWindow.cpp" line="135"/>
         <source>minute</source>
         <translation>
             <numerusform>%n minute</numerusform>
@@ -76,7 +76,7 @@
         </translation>
     </message>
     <message>
-        <location filename="src/ui/ChatWindow.cpp" line="183"/>
+        <location filename="src/ui/ChatWindow.cpp" line="191"/>
         <source>%1 online now:</source>
         <translation type="unfinished"></translation>
     </message>

interface/src/Menu.cpp

@@ -924,14 +924,17 @@ void Menu::goTo() {
     
     int dialogReturn = gotoDialog.exec();
     if (dialogReturn == QDialog::Accepted && !gotoDialog.textValue().isEmpty()) {
-        LocationManager* manager = &LocationManager::getInstance();
+        goToUser(gotoDialog.textValue());
-        manager->goTo(gotoDialog.textValue());
-        connect(manager, &LocationManager::multipleDestinationsFound, this, &Menu::multipleDestinationsDecision);
     }
-    
     sendFakeEnterEvent();
 }
 
+void Menu::goToUser(const QString& user) {
+    LocationManager* manager = &LocationManager::getInstance();
+    manager->goTo(user);
+    connect(manager, &LocationManager::multipleDestinationsFound, this, &Menu::multipleDestinationsDecision);
+}
+
 void Menu::multipleDestinationsDecision(const QJsonObject& userData, const QJsonObject& placeData) {
     QMessageBox msgBox;
     msgBox.setText("Both user and location exists with same name");

interface/src/Menu.h

@@ -122,6 +122,7 @@ public slots:
     void importSettings();
     void exportSettings();
     void goTo();
+    void goToUser(const QString& user);
     void pasteToVoxel();
     
     void toggleLoginMenuItem();

interface/src/ui/ChatWindow.cpp

@@ -6,13 +6,12 @@
 //  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
 //
 
-#include <QFormLayout>
+#include <QGridLayout>
 #include <QFrame>
 #include <QLayoutItem>
 #include <QPalette>
 #include <QScrollBar>
 #include <QSizePolicy>
-#include <QTextDocument>
 #include <QTimer>
 
 #include "Application.h"
@@ -31,17 +30,18 @@ ChatWindow::ChatWindow() :
     ui(new Ui::ChatWindow),
     numMessagesAfterLastTimeStamp(0)
 {
-    QWidget* widget = new QWidget();
+    ui->setupUi(this);
-    setWidget(widget);
+
-    
+    // remove the title bar (see the Qt docs on setTitleBarWidget)
-    ui->setupUi(widget);
+    setTitleBarWidget(new QWidget());
 
     FlowLayout* flowLayout = new FlowLayout(0, 4, 4);
     ui->usersWidget->setLayout(flowLayout);
 
-    ui->messagePlainTextEdit->installEventFilter(this);
+    ui->messagesGridLayout->setColumnStretch(0, 1);
+    ui->messagesGridLayout->setColumnStretch(1, 3);
 
-    ui->closeButton->hide();
+    ui->messagePlainTextEdit->installEventFilter(this);
     
 #ifdef HAVE_QXMPP
     const QXmppClient& xmppClient = XmppClient::getInstance().getXMPPClient();
@@ -76,41 +76,48 @@ ChatWindow::~ChatWindow() {
 }
 
 void ChatWindow::keyPressEvent(QKeyEvent* event) {
-    QWidget::keyPressEvent(event);
+    QDockWidget::keyPressEvent(event);
     if (event->key() == Qt::Key_Escape) {
         hide();
     }
 }
 
 void ChatWindow::showEvent(QShowEvent* event) {
-    QWidget::showEvent(event);
+    QDockWidget::showEvent(event);
     if (!event->spontaneous()) {
+        activateWindow();
         ui->messagePlainTextEdit->setFocus();
     }
 }
 
 bool ChatWindow::eventFilter(QObject* sender, QEvent* event) {
-    Q_UNUSED(sender);
+    if (sender == ui->messagePlainTextEdit) {
-
+        if (event->type() != QEvent::KeyPress) {
-    if (event->type() != QEvent::KeyPress) {
+            return false;
-        return false;
-    }
-    QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
-    if ((keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter) &&
-        (keyEvent->modifiers() & Qt::ShiftModifier) == 0) {
-        QString messageText = ui->messagePlainTextEdit->document()->toPlainText().trimmed();
-        if (!messageText.isEmpty()) {
-#ifdef HAVE_QXMPP
-            const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom();
-            QXmppMessage message;
-            message.setTo(publicChatRoom->jid());
-            message.setType(QXmppMessage::GroupChat);
-            message.setBody(messageText);
-            XmppClient::getInstance().getXMPPClient().sendPacket(message);
-#endif
-            ui->messagePlainTextEdit->document()->clear();
         }
-        return true;
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+        if ((keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter) &&
+            (keyEvent->modifiers() & Qt::ShiftModifier) == 0) {
+            QString messageText = ui->messagePlainTextEdit->document()->toPlainText().trimmed();
+            if (!messageText.isEmpty()) {
+    #ifdef HAVE_QXMPP
+                const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom();
+                QXmppMessage message;
+                message.setTo(publicChatRoom->jid());
+                message.setType(QXmppMessage::GroupChat);
+                message.setBody(messageText);
+                XmppClient::getInstance().getXMPPClient().sendPacket(message);
+    #endif
+                ui->messagePlainTextEdit->document()->clear();
+            }
+            return true;
+        }
+    } else {
+        if (event->type() != QEvent::MouseButtonRelease) {
+            return false;
+        }
+        QString user = sender->property("user").toString();
+        Menu::getInstance()->goToUser(user);
     }
     return false;
 }
@@ -138,8 +145,9 @@ void ChatWindow::addTimeStamp() {
         timeLabel->setStyleSheet("color: palette(shadow);"
                                  "background-color: palette(highlight);"
                                  "padding: 4px;");
+        timeLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
         timeLabel->setAlignment(Qt::AlignHCenter);
-        ui->messagesFormLayout->addRow(timeLabel);
+        ui->messagesGridLayout->addWidget(timeLabel, ui->messagesGridLayout->rowCount(), 0, 1, 2);
         numMessagesAfterLastTimeStamp = 0;
     }
 }
@@ -187,13 +195,21 @@ void ChatWindow::participantsChanged() {
         delete item;
     }
     foreach (const QString& participant, participants) {
-        QLabel* userLabel = new QLabel(getParticipantName(participant));
+        QString participantName = getParticipantName(participant);
+        QLabel* userLabel = new QLabel();
+        userLabel->setText(participantName);
         userLabel->setStyleSheet("background-color: palette(light);"
                                  "border-radius: 5px;"
                                  "color: #267077;"
-                                 "padding: 2px;"
+                                 "padding-top: 3px;"
+                                 "padding-right: 2px;"
+                                 "padding-bottom: 2px;"
+                                 "padding-left: 2px;"
                                  "border: 1px solid palette(shadow);"
                                  "font-weight: bold");
+        userLabel->setProperty("user", participantName);
+        userLabel->setCursor(Qt::PointingHandCursor);
+        userLabel->installEventFilter(this);
         ui->usersWidget->layout()->addWidget(userLabel);
     }
 }
@@ -204,19 +220,25 @@ void ChatWindow::messageReceived(const QXmppMessage& message) {
     }
 
     QLabel* userLabel = new QLabel(getParticipantName(message.from()));
-    userLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    userLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     userLabel->setStyleSheet("padding: 2px; font-weight: bold");
-    userLabel->setAlignment(Qt::AlignTop);
+    userLabel->setAlignment(Qt::AlignTop | Qt::AlignRight);
 
     QLabel* messageLabel = new QLabel(message.body().replace(regexLinks, "<a href=\"\\1\">\\1</a>"));
     messageLabel->setWordWrap(true);
     messageLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
     messageLabel->setOpenExternalLinks(true);
-    messageLabel->setStyleSheet("padding: 2px; margin-right: 20px");
+    messageLabel->setStyleSheet("padding-bottom: 2px; padding-right: 2px; padding-top: 2px; padding-right: 20px");
-    messageLabel->setAlignment(Qt::AlignTop);
+    messageLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft);
 
-    ui->messagesFormLayout->addRow(userLabel, messageLabel);
+    if (getParticipantName(message.from()) == AccountManager::getInstance().getUsername()) {
-    ui->messagesFormLayout->parentWidget()->updateGeometry();
+        userLabel->setStyleSheet(userLabel->styleSheet() + "; background-color: #e1e8ea");
+        messageLabel->setStyleSheet(messageLabel->styleSheet() + "; background-color: #e1e8ea");
+    }
+
+    ui->messagesGridLayout->addWidget(userLabel, ui->messagesGridLayout->rowCount(), 0);
+    ui->messagesGridLayout->addWidget(messageLabel, ui->messagesGridLayout->rowCount() - 1, 1);
+    ui->messagesGridLayout->parentWidget()->updateGeometry();
     Application::processEvents();
     QScrollBar* verticalScrollBar = ui->messagesScrollArea->verticalScrollBar();
     verticalScrollBar->setSliderPosition(verticalScrollBar->maximum());

interface/ui/chatWindow.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ChatWindow</class>
- <widget class="QWidget" name="ChatWindow">
+ <widget class="QDockWidget" name="ChatWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,180 +13,188 @@
   <property name="minimumSize">
    <size>
     <width>400</width>
-    <height>0</height>
+    <height>238</height>
    </size>
   </property>
-  <property name="windowTitle">
-   <string>Chat</string>
-  </property>
   <property name="styleSheet">
    <string notr="true">font-family: Helvetica, Arial, sans-serif;</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <property name="features">
-   <property name="spacing">
+   <set>QDockWidget::NoDockWidgetFeatures</set>
-    <number>0</number>
+  </property>
-   </property>
+  <property name="allowedAreas">
-   <property name="leftMargin">
+   <set>Qt::NoDockWidgetArea</set>
-    <number>8</number>
+  </property>
-   </property>
+  <property name="windowTitle">
-   <property name="topMargin">
+   <string>Chat</string>
-    <number>8</number>
+  </property>
-   </property>
+  <widget class="QWidget" name="dockWidgetContents">
-   <property name="rightMargin">
+   <layout class="QVBoxLayout" name="verticalLayout">
-    <number>8</number>
+    <property name="spacing">
-   </property>
+     <number>0</number>
-   <property name="bottomMargin">
+    </property>
-    <number>8</number>
+    <property name="leftMargin">
-   </property>
+     <number>8</number>
-   <item>
+    </property>
-    <widget class="QLabel" name="connectingToXMPPLabel">
+    <property name="topMargin">
-     <property name="sizePolicy">
+     <number>8</number>
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+    </property>
-       <horstretch>0</horstretch>
+    <property name="rightMargin">
-       <verstretch>0</verstretch>
+     <number>8</number>
-      </sizepolicy>
+    </property>
-     </property>
+    <property name="bottomMargin">
-     <property name="text">
+     <number>8</number>
-      <string>Connecting to XMPP...</string>
+    </property>
-     </property>
+    <item>
-     <property name="alignment">
+     <widget class="QLabel" name="connectingToXMPPLabel">
-      <set>Qt::AlignCenter</set>
+      <property name="sizePolicy">
-     </property>
+       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-    </widget>
+        <horstretch>0</horstretch>
-   </item>
+        <verstretch>0</verstretch>
-   <item>
+       </sizepolicy>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+      </property>
-     <item>
+      <property name="text">
-      <widget class="QLabel" name="numOnlineLabel">
+       <string>Connecting to XMPP...</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="numOnlineLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">font-weight: bold; color: palette(shadow); margin-bottom: 4px;</string>
+        </property>
+        <property name="text">
+         <string> online now:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="closeButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="../resources/resources.qrc">
+          <normaloff>:/images/close.svg</normaloff>:/images/close.svg</iconset>
+        </property>
+        <property name="flat">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="QWidget" name="usersWidget" native="true"/>
+    </item>
+    <item>
+     <widget class="QScrollArea" name="messagesScrollArea">
+      <property name="styleSheet">
+       <string notr="true">margin-top: 12px;</string>
+      </property>
+      <property name="horizontalScrollBarPolicy">
+       <enum>Qt::ScrollBarAlwaysOff</enum>
+      </property>
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="scrollAreaWidgetContents">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>382</width>
+         <height>16</height>
+        </rect>
+       </property>
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="styleSheet">
-        <string notr="true">font-weight: bold; color: palette(shadow); margin-bottom: 4px;</string>
+        <string notr="true">margin-top: 0px;</string>
-       </property>
-       <property name="text">
-        <string> online now:</string>
        </property>
+       <layout class="QGridLayout" name="messagesGridLayout">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <property name="spacing">
+         <number>0</number>
+        </property>
+       </layout>
       </widget>
-     </item>
+     </widget>
-     <item>
+    </item>
-      <widget class="QPushButton" name="closeButton">
+    <item>
-       <property name="sizePolicy">
+     <widget class="QPlainTextEdit" name="messagePlainTextEdit">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+      <property name="sizePolicy">
-         <horstretch>0</horstretch>
+       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <verstretch>0</verstretch>
+        <horstretch>0</horstretch>
-        </sizepolicy>
+        <verstretch>0</verstretch>
-       </property>
+       </sizepolicy>
-       <property name="maximumSize">
+      </property>
-        <size>
+      <property name="minimumSize">
-         <width>16</width>
+       <size>
-         <height>16</height>
+        <width>0</width>
-        </size>
+        <height>60</height>
-       </property>
+       </size>
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../resources/resources.qrc">
-         <normaloff>:/images/close.svg</normaloff>:/images/close.svg</iconset>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QWidget" name="usersWidget" native="true"/>
-   </item>
-   <item>
-    <widget class="QScrollArea" name="messagesScrollArea">
-     <property name="styleSheet">
-      <string notr="true">margin-top: 12px;</string>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>358</width>
-        <height>464</height>
-       </rect>
       </property>
       <property name="styleSheet">
-       <string notr="true">margin-top: 0px;</string>
+       <string notr="true">border-color: palette(dark); border-style: solid;  border-left-width: 1px; border-right-width: 1px; border-bottom-width: 1px;</string>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="horizontalScrollBarPolicy">
+       <enum>Qt::ScrollBarAlwaysOff</enum>
+      </property>
+      <property name="sizeAdjustPolicy">
+       <enum>QAbstractScrollArea::AdjustToContents</enum>
+      </property>
+      <property name="tabChangesFocus">
+       <bool>true</bool>
       </property>
-      <layout class="QFormLayout" name="messagesFormLayout">
-       <property name="fieldGrowthPolicy">
-        <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-       </property>
-       <property name="horizontalSpacing">
-        <number>0</number>
-       </property>
-       <property name="verticalSpacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>4</number>
-       </property>
-       <property name="topMargin">
-        <number>4</number>
-       </property>
-       <property name="rightMargin">
-        <number>4</number>
-       </property>
-       <property name="bottomMargin">
-        <number>4</number>
-       </property>
-      </layout>
      </widget>
-    </widget>
+    </item>
-   </item>
+   </layout>
-   <item>
+  </widget>
-    <widget class="QPlainTextEdit" name="messagePlainTextEdit">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>60</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">border-color: palette(dark); border-style: solid;  border-left-width: 1px; border-right-width: 1px; border-bottom-width: 1px;</string>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="sizeAdjustPolicy">
-      <enum>QAbstractScrollArea::AdjustToContents</enum>
-     </property>
-     <property name="tabChangesFocus">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
  </widget>
  <tabstops>
   <tabstop>messagePlainTextEdit</tabstop>