Update chat window to use new Frameless Dialog

The new dialog class needed to be updated to handle windows in different
positions and windows that don't delete on close.

interface/src/Menu.cpp

@@ -1060,23 +1060,22 @@ void Menu::showMetavoxelEditor() {
 void Menu::showChat() {
     QMainWindow* mainWindow = Application::getInstance()->getWindow();
     if (!_chatWindow) {
-        mainWindow->addDockWidget(Qt::RightDockWidgetArea, _chatWindow = new ChatWindow());
+        _chatWindow = new ChatWindow(mainWindow);
     }
-    if (!_chatWindow->toggleViewAction()->isChecked()) {
-        const QRect& windowGeometry = mainWindow->geometry();
-        _chatWindow->move(windowGeometry.topRight().x() - _chatWindow->width(),
-                          windowGeometry.topRight().y() + (windowGeometry.height() / 2) - (_chatWindow->height() / 2));
-
-        _chatWindow->resize(0, _chatWindow->height());
-        _chatWindow->toggleViewAction()->trigger();
+    if (_chatWindow->isHidden()) {
+        _chatWindow->show();
     }
 }
 
 void Menu::toggleChat() {
 #ifdef HAVE_QXMPP
     _chatAction->setEnabled(XmppClient::getInstance().getXMPPClient().isConnected());
-    if (!_chatAction->isEnabled() && _chatWindow && _chatWindow->toggleViewAction()->isChecked()) {
-        _chatWindow->toggleViewAction()->trigger();
+    if (!_chatAction->isEnabled() && _chatWindow) {
+        if (_chatWindow->isHidden()) {
+            _chatWindow->show();
+        } else {
+            _chatWindow->hide();
+        }
     }
 #endif
 }

interface/src/ui/ChatWindow.cpp

@@ -12,12 +12,10 @@
 #include <QGridLayout>
 #include <QFrame>
 #include <QLayoutItem>
-#include <QMainWindow>
 #include <QPalette>
 #include <QScrollBar>
 #include <QSizePolicy>
 #include <QTimer>
-#include <QWidget>
 
 #include "Application.h"
 #include "FlowLayout.h"
@@ -32,18 +30,16 @@ const int NUM_MESSAGES_TO_TIME_STAMP = 20;
 
 const QRegularExpression regexLinks("((?:(?:ftp)|(?:https?))://\\S+)");
 
-ChatWindow::ChatWindow() :
+ChatWindow::ChatWindow(QWidget* parent) :
+    FramelessDialog(parent, 0, POSITION_RIGHT),
     ui(new Ui::ChatWindow),
     numMessagesAfterLastTimeStamp(0),
     _mousePressed(false),
     _mouseStartPosition()
 {
-    ui->setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose, false);
 
-    // remove the title bar (see the Qt docs on setTitleBarWidget), but we keep it for undocking
-    //
-    titleBar = titleBarWidget();
-    setTitleBarWidget(new QWidget());
+    ui->setupUi(this);
 
     FlowLayout* flowLayout = new FlowLayout(0, 4, 4);
     ui->usersWidget->setLayout(flowLayout);
@@ -89,41 +85,23 @@ ChatWindow::~ChatWindow() {
     delete ui;
 }
 
-void ChatWindow::mousePressEvent(QMouseEvent *e) {
-    if (e->button() == Qt::LeftButton && isFloating()) {
-        _mousePressed = true;
-        _mouseStartPosition = e->pos();
-    }
-}
-
-void ChatWindow::mouseMoveEvent(QMouseEvent *e) {
-    if (_mousePressed) {
-        move(mapToParent(e->pos() - _mouseStartPosition));
-    }
-}
-
-void ChatWindow::mouseReleaseEvent( QMouseEvent *e ) {
-    if ( e->button() == Qt::LeftButton ) {
-        _mousePressed = false;
-    }
-}
-
 void ChatWindow::keyPressEvent(QKeyEvent* event) {
-    QDockWidget::keyPressEvent(event);
     if (event->key() == Qt::Key_Escape) {
         hide();
+    } else {
+        FramelessDialog::keyPressEvent(event);
     }
 }
 
 void ChatWindow::showEvent(QShowEvent* event) {
-    QDockWidget::showEvent(event);
+    FramelessDialog::showEvent(event);
     if (!event->spontaneous()) {
-        activateWindow();
         ui->messagePlainTextEdit->setFocus();
     }
 }
 
 bool ChatWindow::eventFilter(QObject* sender, QEvent* event) {
+    FramelessDialog::eventFilter(sender, event);
     if (sender == ui->messagePlainTextEdit) {
         if (event->type() != QEvent::KeyPress) {
             return false;

interface/src/ui/ChatWindow.h

@@ -17,6 +17,7 @@
 #include <QTimer>
 
 #include <Application.h>
+#include "FramelessDialog.h"
 
 #ifdef HAVE_QXMPP
 
@@ -29,23 +30,19 @@ namespace Ui {
 class ChatWindow;
 }
 
-class ChatWindow : public QDockWidget {
+class ChatWindow : public FramelessDialog {
     Q_OBJECT
 
 public:
-    ChatWindow();
+    ChatWindow(QWidget* parent);
     ~ChatWindow();
 
-    virtual void keyPressEvent(QKeyEvent *event);
-    virtual void showEvent(QShowEvent* event);
-
-    virtual void mousePressEvent(QMouseEvent *e);
-    virtual void mouseMoveEvent(QMouseEvent *e);
-    virtual void mouseReleaseEvent(QMouseEvent *e);
-
 protected:
     bool eventFilter(QObject* sender, QEvent* event);
 
+    virtual void keyPressEvent(QKeyEvent *event);
+    virtual void showEvent(QShowEvent* event);
+
 private:
 #ifdef HAVE_QXMPP
     QString getParticipantName(const QString& participant);
@@ -56,7 +53,6 @@ private:
     void scrollToBottom();
 
     Ui::ChatWindow* ui;
-    QWidget* titleBar;
     int numMessagesAfterLastTimeStamp;
     QDateTime lastMessageStamp;
     bool _mousePressed;

interface/src/ui/FramelessDialog.cpp

@@ -14,8 +14,13 @@
 
 const int RESIZE_HANDLE_WIDTH = 7;
 
-FramelessDialog::FramelessDialog(QWidget *parent, Qt::WindowFlags flags) :
-QDialog(parent, flags | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint) {
+FramelessDialog::FramelessDialog(QWidget *parent, Qt::WindowFlags flags, Position position) :
+        QDialog(parent, flags | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint),
+        _position(position),
+        _selfHidden(false),
+        _isResizing(false),
+        _resizeInitialWidth(0) {
+
     setAttribute(Qt::WA_DeleteOnClose);
 
     // handle rezize and move events
@@ -29,29 +34,37 @@ bool FramelessDialog::eventFilter(QObject* sender, QEvent* event) {
     switch (event->type()) {
         case QEvent::Move:
             if (sender == parentWidget()) {
-                // move to upper left corner on app move
-                move(parentWidget()->geometry().topLeft());
+                resizeAndPosition(false);
             }
             break;
         case QEvent::Resize:
             if (sender == parentWidget()) {
-                // keep full app height on resizing the app
-                setFixedHeight(parentWidget()->size().height());
+                resizeAndPosition(false);
             }
             break;
         case QEvent::WindowStateChange:
             if (parentWidget()->isMinimized()) {
-                setHidden(true);
-            } else {
+                if (isVisible()) {
+                    _selfHidden = true;
+                    setHidden(true);
+                }
+            } else if (_selfHidden) {
+                _selfHidden = false;
                 setHidden(false);
             }
             break;
         case QEvent::ApplicationDeactivate:
             // hide on minimize and focus lost
-            setHidden(true);
+            if (isVisible()) {
+                _selfHidden = true;
+                setHidden(true);
+            }
             break;
         case QEvent::ApplicationActivate:
-            setHidden(false);
+            if (_selfHidden) {
+                _selfHidden = false;
+                setHidden(false);
+            }
             break;
         default:
             break;
@@ -70,21 +83,38 @@ void FramelessDialog::setStyleSheetFile(const QString& fileName) {
 }
 
 void FramelessDialog::showEvent(QShowEvent* event) {
-    // move to upper left corner
-    move(parentWidget()->geometry().topLeft());
+    resizeAndPosition();
+}
 
+void FramelessDialog::resizeAndPosition(bool resizeParent) {
     // keep full app height
     setFixedHeight(parentWidget()->size().height());
 
     // resize parrent if width is smaller than this dialog
-    if (parentWidget()->size().width() < size().width()) {
+    if (resizeParent && parentWidget()->size().width() < size().width()) {
         parentWidget()->resize(size().width(), parentWidget()->size().height());
     }
+
+    if (_position == POSITION_LEFT) {
+        // move to upper left corner
+        move(parentWidget()->geometry().topLeft());
+    } else if (_position == POSITION_RIGHT) {
+        // move to upper right corner
+        QPoint pos = parentWidget()->geometry().topRight();
+        pos.setX(pos.x() - size().width());
+        move(pos);
+    }
 }
+
 void FramelessDialog::mousePressEvent(QMouseEvent* mouseEvent) {
-    if (abs(mouseEvent->pos().x() - size().width()) < RESIZE_HANDLE_WIDTH && mouseEvent->button() == Qt::LeftButton) {
-        _isResizing = true;
-        QApplication::setOverrideCursor(Qt::SizeHorCursor);
+    if (mouseEvent->button() == Qt::LeftButton) {
+        bool hitLeft = _position == POSITION_LEFT && abs(mouseEvent->pos().x() - size().width()) < RESIZE_HANDLE_WIDTH;
+        bool hitRight = _position == POSITION_RIGHT && mouseEvent->pos().x() < RESIZE_HANDLE_WIDTH;
+        if (hitLeft || hitRight) {
+            _isResizing = true;
+            _resizeInitialWidth = size().width();
+            QApplication::setOverrideCursor(Qt::SizeHorCursor);
+        }
     }
 }
 
@@ -95,6 +125,14 @@ void FramelessDialog::mouseReleaseEvent(QMouseEvent* mouseEvent) {
 
 void FramelessDialog::mouseMoveEvent(QMouseEvent* mouseEvent) {
     if (_isResizing) {
-        resize(mouseEvent->pos().x(), size().height());
+        if (_position == POSITION_LEFT) {
+            resize(mouseEvent->pos().x(), size().height());
+        } else if (_position == POSITION_RIGHT) {
+            setUpdatesEnabled(false);
+            resize(_resizeInitialWidth - mouseEvent->pos().x(), size().height());
+            resizeAndPosition();
+            _resizeInitialWidth = size().width();
+            setUpdatesEnabled(true);
+        }
     }
 }

interface/src/ui/FramelessDialog.h

@@ -19,7 +19,10 @@ class FramelessDialog : public QDialog {
     Q_OBJECT
     
 public:
-    FramelessDialog(QWidget* parent = 0, Qt::WindowFlags flags = 0);
+    enum Position { POSITION_LEFT, POSITION_RIGHT };
+
+    FramelessDialog(QWidget* parent = 0, Qt::WindowFlags flags = 0,
+                    Position position = POSITION_LEFT);
     void setStyleSheetFile(const QString& fileName);
 
 protected:
@@ -31,7 +34,12 @@ protected:
     bool eventFilter(QObject* sender, QEvent* event);
 
 private:
+    void resizeAndPosition(bool resizeParent = true);
+
     bool _isResizing;
+    int _resizeInitialWidth;
+    bool _selfHidden; ///< true when the dialog itself because of a window event (deactivation or minimization)
+    Position _position;
 
 };
 

interface/src/ui/PreferencesDialog.cpp

@@ -19,7 +19,7 @@ const int SCROLL_PANEL_BOTTOM_MARGIN = 30;
 const int OK_BUTTON_RIGHT_MARGIN = 30;
 const int BUTTONS_TOP_MARGIN = 24;
 
-PreferencesDialog::PreferencesDialog(QWidget* parent, Qt::WindowFlags flags) : FramelessDialog(parent, flags) {
+PreferencesDialog::PreferencesDialog(QWidget* parent, Qt::WindowFlags flags) : FramelessDialog(parent, flags, POSITION_LEFT) {
 
     ui.setupUi(this);
     setStyleSheetFile("styles/preferences.qss");

interface/ui/chatWindow.ui

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ChatWindow</class>
- <widget class="QDockWidget" name="ChatWindow">
+ <widget class="QDialog" name="ChatWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>608</height>
+    <height>440</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -16,127 +16,95 @@
     <height>238</height>
    </size>
   </property>
-  <property name="styleSheet">
-   <string notr="true">font-family: Helvetica, Arial, sans-serif;</string>
-  </property>
-  <property name="features">
-   <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
-  </property>
-  <property name="allowedAreas">
-   <set>Qt::NoDockWidgetArea</set>
-  </property>
   <property name="windowTitle">
    <string>Chat</string>
   </property>
-  <widget class="QWidget" name="dockWidgetContents">
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="spacing">
-     <number>0</number>
-    </property>
-    <property name="leftMargin">
-     <number>8</number>
-    </property>
-    <property name="topMargin">
-     <number>8</number>
-    </property>
-    <property name="rightMargin">
-     <number>8</number>
-    </property>
-    <property name="bottomMargin">
-     <number>8</number>
-    </property>
-    <item>
-     <widget class="QLabel" name="connectingToXMPPLabel">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="text">
-       <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="togglePinnedButton">
-        <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>
-          <normaloff>../resources/images/pin.svg</normaloff>
-          <normalon>../resources/images/pinned.svg</normalon>../resources/images/pin.svg</iconset>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="default">
-         <bool>false</bool>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </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="styleSheet">
-         <string notr="true">QPushButton {
+  <property name="styleSheet">
+   <string notr="true">font-family: Helvetica, Arial, sans-serif;</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <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>
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="leftMargin">
+      <number>8</number>
+     </property>
+     <property name="topMargin">
+      <number>8</number>
+     </property>
+     <property name="rightMargin">
+      <number>8</number>
+     </property>
+     <property name="bottomMargin">
+      <number>8</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="connectingToXMPPLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <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="styleSheet">
+          <string notr="true">QPushButton {
     background-color: rgba( 0, 0, 0, 0% );
 	border: none;
     image: url(../resources/images/close.svg)
@@ -148,102 +116,105 @@ QPushButton:pressed {
 	border: none;
     image: url(../resources/images/close_down.svg)
 }</string>
-        </property>
-        <property name="text">
-         <string/>
-        </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="text">
+          <string/>
+         </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="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">margin-top: 0px;</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>
+      </widget>
+     </item>
+     <item>
+      <widget class="QTextEdit" name="messagePlainTextEdit">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="styleSheet">
-        <string notr="true">margin-top: 0px;</string>
+       <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>
-       <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>
-     </widget>
-    </item>
-    <item>
-     <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>
+     </item>
+    </layout>
+   </item>
+  </layout>
+  <zorder>messagePlainTextEdit</zorder>
+  <zorder>dockWidgetContents</zorder>
  </widget>
  <tabstops>
   <tabstop>messagePlainTextEdit</tabstop>