From 4afea2d2289a237c9d8bb647f3c571bf7c0a0da2 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 16 Apr 2014 09:55:12 -0700
Subject: [PATCH] Remove chat window docking

---
 interface/resources/images/pin.svg    |  98 ------------------------
 interface/resources/images/pinned.svg | 106 --------------------------
 interface/src/ui/ChatWindow.cpp       |  13 ----
 interface/src/ui/ChatWindow.h         |   1 -
 interface/ui/chatWindow.ui            |  16 ----
 5 files changed, 234 deletions(-)
 delete mode 100644 interface/resources/images/pin.svg
 delete mode 100644 interface/resources/images/pinned.svg

diff --git a/interface/resources/images/pin.svg b/interface/resources/images/pin.svg
deleted file mode 100644
index ec968a1ec1..0000000000
--- a/interface/resources/images/pin.svg
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="44px"
-   height="44px"
-   viewBox="0 0 44 44"
-   version="1.1"
-   id="svg2"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close.svg">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Slice 1</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="3.7926636"
-     inkscape:cx="57.156875"
-     inkscape:cy="33.978935"
-     inkscape:window-x="536"
-     inkscape:window-y="258"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <title
-     id="title4">Slice 1</title>
-  <description
-     id="description6">Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-  <defs
-     id="defs8" />
-  <g
-     id="Page-1"
-     sketch:type="MSPage"
-     transform="translate(0.52733383,0.52733392)"
-     style="fill:none;stroke:none" />
-  <rect
-     id="rect2993"
-     width="5.7796612"
-     height="26.101694"
-     x="19.730724"
-     y="16.374792"
-     ry="3.371469" />
-  <rect
-     id="rect2995"
-     width="35.423729"
-     height="2.9830508"
-     x="4.6290293"
-     y="2.3917408"
-     ry="1.4915254" />
-  <rect
-     id="rect2999"
-     width="31.135593"
-     height="21.067797"
-     x="6.6798768"
-     y="4.0697069"
-     ry="1.4915254" />
-  <rect
-     style="fill:#ff0000"
-     id="rect3003"
-     width="27.779657"
-     height="17.711861"
-     x="8.171401"
-     y="5.3747911"
-     ry="0.46610171" />
-  <rect
-     style="fill:#999999"
-     id="rect3011"
-     width="3.1694915"
-     height="13.983051"
-     x="21.035809"
-     y="25.883266"
-     ry="0.46610171" />
-</svg>
diff --git a/interface/resources/images/pinned.svg b/interface/resources/images/pinned.svg
deleted file mode 100644
index bda6f0e747..0000000000
--- a/interface/resources/images/pinned.svg
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="44px"
-   height="44px"
-   viewBox="0 0 44 44"
-   version="1.1"
-   id="svg2"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="pin.svg">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Slice 1</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1058"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="3.7926636"
-     inkscape:cx="39.754857"
-     inkscape:cy="33.978935"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <title
-     id="title4">Slice 1</title>
-  <description
-     id="description6">Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-  <defs
-     id="defs8" />
-  <g
-     id="Page-1"
-     sketch:type="MSPage"
-     transform="translate(0.52733383,0.52733392)"
-     style="fill:none;stroke:none" />
-  <rect
-     style="fill:#b3b3b3"
-     id="rect3013"
-     width="43.768692"
-     height="44.296078"
-     x="0.26366693"
-     y="-0.032378189"
-     ry="0.46610171" />
-  <rect
-     id="rect2993"
-     width="5.7796612"
-     height="26.101694"
-     x="19.730724"
-     y="16.374792"
-     ry="3.371469" />
-  <rect
-     id="rect2995"
-     width="35.423729"
-     height="2.9830508"
-     x="4.6290293"
-     y="2.3917408"
-     ry="1.4915254" />
-  <rect
-     id="rect2999"
-     width="31.135593"
-     height="21.067797"
-     x="6.6798768"
-     y="4.0697069"
-     ry="1.4915254" />
-  <rect
-     style="fill:#ff0000"
-     id="rect3003"
-     width="27.779657"
-     height="17.711861"
-     x="8.171401"
-     y="5.3747911"
-     ry="0.46610171" />
-  <rect
-     style="fill:#999999"
-     id="rect3011"
-     width="3.1694915"
-     height="13.983051"
-     x="21.035809"
-     y="25.883266"
-     ry="0.46610171" />
-</svg>
diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp
index 635f1f3d10..c190169c43 100644
--- a/interface/src/ui/ChatWindow.cpp
+++ b/interface/src/ui/ChatWindow.cpp
@@ -323,16 +323,3 @@ void ChatWindow::scrollToBottom() {
     QScrollBar* verticalScrollBar = ui->messagesScrollArea->verticalScrollBar();
     verticalScrollBar->setSliderPosition(verticalScrollBar->maximum());
 }
-
-void ChatWindow::togglePinned() {
-    QMainWindow* mainWindow = Application::getInstance()->getWindow();
-    mainWindow->removeDockWidget(this);
-    if (ui->togglePinnedButton->isChecked()) {
-        mainWindow->addDockWidget(ui->togglePinnedButton->isChecked() ? Qt::RightDockWidgetArea : Qt::NoDockWidgetArea, this);
-    }
-    if (!this->toggleViewAction()->isChecked()) {
-        this->toggleViewAction()->trigger();
-    }
-    this->setFloating(!ui->togglePinnedButton->isChecked());
-    setTitleBarWidget(ui->togglePinnedButton->isChecked()?new QWidget():titleBar);
-}
diff --git a/interface/src/ui/ChatWindow.h b/interface/src/ui/ChatWindow.h
index 6a807f9b81..536ac17799 100644
--- a/interface/src/ui/ChatWindow.h
+++ b/interface/src/ui/ChatWindow.h
@@ -65,7 +65,6 @@ private:
 private slots:
     void connected();
     void timeout();
-    void togglePinned();
 #ifdef HAVE_QXMPP
     void error(QXmppClient::Error error);
     void participantsChanged();
diff --git a/interface/ui/chatWindow.ui b/interface/ui/chatWindow.ui
index 0372e00c09..1d06a1e99b 100644
--- a/interface/ui/chatWindow.ui
+++ b/interface/ui/chatWindow.ui
@@ -251,22 +251,6 @@ QPushButton:pressed {
  </tabstops>
  <resources/>
  <connections>
-  <connection>
-   <sender>togglePinnedButton</sender>
-   <signal>clicked()</signal>
-   <receiver>ChatWindow</receiver>
-   <slot>togglePinned()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>390</x>
-     <y>42</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>550</x>
-     <y>42</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>closeButton</sender>
    <signal>clicked()</signal>