4 files changed, 27 insertions, 19 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp
index 145371f..4bae755 100644
--- a/Swift/QtUI/QtChatView.cpp
+++ b/Swift/QtUI/QtChatView.cpp
@@ -29,10 +29,11 @@ QtChatView::QtChatView(QtChatTheme* theme, QWidget* parent) : QWidget(parent) {
        mainLayout->setContentsMargins(0,0,0,0);
        webView_ = new QtWebView(this);
        connect(webView_, SIGNAL(linkClicked(const QUrl&)), SLOT(handleLinkClicked(const QUrl&)));
        connect(webView_, SIGNAL(loadFinished(bool)), SLOT(handleViewLoadFinished(bool)));
        connect(webView_, SIGNAL(gotFocus()), SIGNAL(gotFocus()));
+        connect(webView_, SIGNAL(clearRequested()), SLOT(resetView()));
 #ifdef Q_WS_X11
        /* To give a border on Linux, where it looks bad without */
        QStackedWidget* stack = new QStackedWidget(this);
        stack->addWidget(webView_);
        stack->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
@@ -49,26 +50,11 @@ QtChatView::QtChatView(QtChatTheme* theme, QWidget* parent) : QWidget(parent) {
        webPage_->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
        webView_->setPage(webPage_);
        connect(webPage_, SIGNAL(selectionChanged()), SLOT(copySelectionToClipboard()));
        viewReady_ = false;
-        QString pageHTML = theme_->getTemplate();
+        resetView();
-        pageHTML.replace("==bodyBackground==", "background-color:#e3e3e3");
-        pageHTML.replace(pageHTML.indexOf("%@"), 2, theme_->getBase());
-        if (pageHTML.count("%@") > 3) {
-                pageHTML.replace(pageHTML.indexOf("%@"), 2, theme_->getMainCSS());
-        }
-        pageHTML.replace(pageHTML.indexOf("%@"), 2, "Variants/Blue on Green.css");
-        pageHTML.replace(pageHTML.indexOf("%@"), 2, ""/*headerSnippet.getContent()*/);
-        pageHTML.replace(pageHTML.indexOf("%@"), 2, ""/*footerSnippet.getContent()*/);
-        webPage_->mainFrame()->setHtml(pageHTML);
-        document_ = webPage_->mainFrame()->documentElement();
-        QWebElement chatElement = document_.findFirst("#Chat");
-        newInsertPoint_ = chatElement.clone();
-        newInsertPoint_.setOuterXml("<div id='swift_insert'/>");
-        chatElement.appendInside(newInsertPoint_);
-        Q_ASSERT(!newInsertPoint_.isNull());
 }
 void QtChatView::handleKeyPressEvent(QKeyEvent* event) {
        webView_->keyPressEvent(event);
 }
@@ -161,6 +147,25 @@ void QtChatView::handleViewLoadFinished(bool ok) {
        Q_ASSERT(ok);
        viewReady_ = true;
        addQueuedSnippets();
 }
+void QtChatView::resetView() {
+        QString pageHTML = theme_->getTemplate();
+        pageHTML.replace("==bodyBackground==", "background-color:#e3e3e3");
+        pageHTML.replace(pageHTML.indexOf("%@"), 2, theme_->getBase());
+        if (pageHTML.count("%@") > 3) {
+                pageHTML.replace(pageHTML.indexOf("%@"), 2, theme_->getMainCSS());
+        }
+        pageHTML.replace(pageHTML.indexOf("%@"), 2, "Variants/Blue on Green.css");
+        pageHTML.replace(pageHTML.indexOf("%@"), 2, ""/*headerSnippet.getContent()*/);
+        pageHTML.replace(pageHTML.indexOf("%@"), 2, ""/*footerSnippet.getContent()*/);
+        webPage_->mainFrame()->setHtml(pageHTML);
+        document_ = webPage_->mainFrame()->documentElement();
+        QWebElement chatElement = document_.findFirst("#Chat");
+        newInsertPoint_ = chatElement.clone();
+        newInsertPoint_.setOuterXml("<div id='swift_insert'/>");
+        chatElement.appendInside(newInsertPoint_);
+        Q_ASSERT(!newInsertPoint_.isNull());
+}
 }
diff --git a/Swift/QtUI/QtChatView.h b/Swift/QtUI/QtChatView.h
index e60c92f..8c1a99a 100644
--- a/Swift/QtUI/QtChatView.h
+++ b/Swift/QtUI/QtChatView.h
@@ -39,10 +39,11 @@ namespace Swift {
                public slots:
                        void copySelectionToClipboard();
                        void scrollToBottom();
                        void handleLinkClicked(const QUrl&);
                        void handleKeyPressEvent(QKeyEvent* event);
+                        void resetView();
                private slots:
                        void handleViewLoadFinished(bool);
                private:
diff --git a/Swift/QtUI/QtWebView.cpp b/Swift/QtUI/QtWebView.cpp
index 93ecc18..df8479d 100644
--- a/Swift/QtUI/QtWebView.cpp
+++ b/Swift/QtUI/QtWebView.cpp
@@ -29,21 +29,22 @@ void QtWebView::keyPressEvent(QKeyEvent* event) {
                                                           event->count());
        QWebView::keyPressEvent(translatedEvent);
        delete translatedEvent;
 }
-void QtWebView::dragEnterEvent(QDragEnterEvent *event) {
+void QtWebView::dragEnterEvent(QDragEnterEvent*) {
 }
 void QtWebView::contextMenuEvent(QContextMenuEvent* ev) {
+        QMenu menu(this);
        QAction* copyLinkAction = pageAction(QWebPage::CopyLinkToClipboard);
        if (copyLinkAction) {
-                QMenu menu(this);
                menu.addAction(copyLinkAction);
-                menu.exec(ev->globalPos());
        }
+        menu.addAction("Clear", this, SIGNAL(clearRequested()));
+        menu.exec(ev->globalPos());
 }
 void QtWebView::focusInEvent(QFocusEvent* event) {
        QWebView::focusInEvent(event);
        emit gotFocus();
diff --git a/Swift/QtUI/QtWebView.h b/Swift/QtUI/QtWebView.h
index 171330d..f60e5ef 100644
--- a/Swift/QtUI/QtWebView.h
+++ b/Swift/QtUI/QtWebView.h
@@ -18,10 +18,11 @@ namespace Swift {
                        void dragEnterEvent(QDragEnterEvent *event);
                        void contextMenuEvent(QContextMenuEvent* ev);
                signals:
                        void gotFocus();
+                        void clearRequested();
                protected:
                        void focusInEvent(QFocusEvent* event);
        };
 }