Merge branch 'master' of https://github.com/Geenz/hifi into 19514

interface/CMakeLists.txt

@@ -230,11 +230,7 @@ if (APPLE)
         RUNTIME DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/install" COMPONENT Runtime
     )
 else (APPLE)
-  # remove and then copy the resources files beside the executable
+  # copy the resources files beside the executable
-  add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
-    COMMAND "${CMAKE_COMMAND}" -E remove_directory
-    $<TARGET_FILE_DIR:${TARGET_NAME}>/resources
-  )
   add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
     COMMAND "${CMAKE_COMMAND}" -E copy_directory
     "${PROJECT_SOURCE_DIR}/resources"

interface/interface_en.ts

@@ -4,22 +4,22 @@
 <context>
     <name>Application</name>
     <message>
-        <location filename="src/Application.cpp" line="1354"/>
+        <location filename="src/Application.cpp" line="1353"/>
         <source>Export Voxels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="1355"/>
+        <location filename="src/Application.cpp" line="1354"/>
         <source>Sparse Voxel Octree Files (*.svo)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3554"/>
+        <location filename="src/Application.cpp" line="3557"/>
         <source>Open Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3555"/>
+        <location filename="src/Application.cpp" line="3558"/>
         <source>JavaScript Files (*.js)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45,7 +45,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="110"/>
+        <location filename="src/ui/ChatWindow.cpp" line="115"/>
         <source>day</source>
         <translation>
             <numerusform>%n day</numerusform>
@@ -53,7 +53,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="110"/>
+        <location filename="src/ui/ChatWindow.cpp" line="115"/>
         <source>hour</source>
         <translation>
             <numerusform>%n hour</numerusform>
@@ -61,7 +61,7 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/ui/ChatWindow.cpp" line="110"/>
+        <location filename="src/ui/ChatWindow.cpp" line="115"/>
         <source>minute</source>
         <translation>
             <numerusform>%n minute</numerusform>
@@ -76,7 +76,7 @@
         </translation>
     </message>
     <message>
-        <location filename="src/ui/ChatWindow.cpp" line="163"/>
+        <location filename="src/ui/ChatWindow.cpp" line="170"/>
         <source>%1 online now:</source>
         <translation type="unfinished"></translation>
     </message>

interface/src/Application.cpp

@@ -121,8 +121,6 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
 QString& Application::resourcesPath() {
 #ifdef Q_OS_MAC
     static QString staticResourcePath = QCoreApplication::applicationDirPath() + "/../Resources/";
-#elif defined Q_OS_LINUX
-    static QString staticResourcePath = "resources/";
 #else
     static QString staticResourcePath = QCoreApplication::applicationDirPath() + "/resources/";
 #endif

interface/src/Menu.cpp

@@ -1043,6 +1043,8 @@ void Menu::showChat() {
                                  mainWindow->geometry().y(),
                                  _chatWindow->width(),
                                  mainWindow->height());
+    }
+    if (!_chatWindow->isVisible()) {
         _chatWindow->show();
     }
     _chatWindow->raise();

interface/src/ui/ChatWindow.cpp

@@ -50,6 +50,7 @@ ChatWindow::ChatWindow() :
         startTimerForTimeStamps();
     } else {
         ui->numOnlineLabel->hide();
+        ui->closeButton->hide();
         ui->usersWidget->hide();
         ui->messagesScrollArea->hide();
         ui->messagePlainTextEdit->hide();
@@ -71,6 +72,10 @@ ChatWindow::~ChatWindow() {
     delete ui;
 }
 
+void ChatWindow::reject() {
+    hide();
+}
+
 bool ChatWindow::eventFilter(QObject* sender, QEvent* event) {
     Q_UNUSED(sender);
 
@@ -136,9 +141,11 @@ void ChatWindow::startTimerForTimeStamps() {
 void ChatWindow::connected() {
     ui->connectingToXMPPLabel->hide();
     ui->numOnlineLabel->show();
+    ui->closeButton->show();
     ui->usersWidget->show();
     ui->messagesScrollArea->show();
     ui->messagePlainTextEdit->show();
+    ui->messagePlainTextEdit->setFocus();
 #ifdef HAVE_QXMPP
     const QXmppMucRoom* publicChatRoom = XmppClient::getInstance().getPublicChatRoom();
     connect(publicChatRoom, SIGNAL(participantsChanged()), this, SLOT(participantsChanged()));

interface/src/ui/ChatWindow.h

@@ -33,6 +33,8 @@ public:
     ChatWindow();
     ~ChatWindow();
 
+    virtual void reject();
+
 protected:
     bool eventFilter(QObject* sender, QEvent* event);
 

interface/ui/chatWindow.ui

@@ -185,10 +185,10 @@
    <sender>closeButton</sender>
    <signal>clicked()</signal>
    <receiver>ChatWindow</receiver>
-   <slot>accept()</slot>
+   <slot>hide()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>342</x>
+     <x>390</x>
      <y>42</y>
     </hint>
     <hint type="destinationlabel">