summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-10-09 08:05:13 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-10-09 08:05:13 (GMT)
commitcc9f9ba0bb389b014929af6f8f53e3248463612d (patch)
tree48da8c516bb1745bb1b576f104c0def4e6377818
parent2c6f1075474f6b8086cc6abf7978aee9421761c8 (diff)
downloadswift-contrib-cc9f9ba0bb389b014929af6f8f53e3248463612d.zip
swift-contrib-cc9f9ba0bb389b014929af6f8f53e3248463612d.tar.bz2
Filter chat view actions again.
-rw-r--r--Swift/QtUI/QtChatView.cpp4
-rw-r--r--Swift/QtUI/QtWebView.cpp3
2 files changed, 2 insertions, 5 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp
index 7bb5818..97ce992 100644
--- a/Swift/QtUI/QtChatView.cpp
+++ b/Swift/QtUI/QtChatView.cpp
@@ -57,9 +57,7 @@ QtChatView::QtChatView(QtChatTheme* theme, QWidget* parent) : QWidget(parent), f
webPage_ = new QWebPage(this);
webPage_->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
-#ifdef SWIFT_EXPERIMENTAL_FT
- webPage_->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-#endif
+ //webPage_->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
webView_->setPage(webPage_);
connect(webPage_, SIGNAL(selectionChanged()), SLOT(copySelectionToClipboard()));
diff --git a/Swift/QtUI/QtWebView.cpp b/Swift/QtUI/QtWebView.cpp
index d393b6c..388f06a 100644
--- a/Swift/QtUI/QtWebView.cpp
+++ b/Swift/QtUI/QtWebView.cpp
@@ -47,7 +47,6 @@ void QtWebView::contextMenuEvent(QContextMenuEvent* ev) {
// Filter out the relevant actions from the standard actions
QMenu* menu = page()->createStandardContextMenu();
- /*
QList<QAction*> actions(menu->actions());
for (int i = 0; i < actions.size(); ++i) {
QAction* action = actions.at(i);
@@ -61,7 +60,7 @@ void QtWebView::contextMenuEvent(QContextMenuEvent* ev) {
if (removeAction) {
menu->removeAction(action);
}
- }*/
+ }
// Add our own custom actions
menu->addAction(tr("Clear"), this, SIGNAL(clearRequested()));