Swiftdiff options
| author | Cătălin Badea <catalin.badea392@gmail.com> | 2012-08-21 17:45:40 (GMT) |
|---|---|---|
| committer | Cătălin Badea <catalin.badea392@gmail.com> | 2012-08-21 17:46:49 (GMT) |
| commit | 8539b9f1ef656147196ae57a3403b321d1032513 (patch) | |
| tree | 99525b4b746a9e71a0e811b70e7c49be86ee9521 /Swift/QtUI | |
| parent | e5548caf08dbb4fe4208a23ece9e8e9e0667a8dd (diff) | |
| download | swift-contrib-8539b9f1ef656147196ae57a3403b321d1032513.zip swift-contrib-8539b9f1ef656147196ae57a3403b321d1032513.tar.bz2 | |
Add experimental flags.catalinb/history2
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtChatView.cpp | 4 | ||||
| -rw-r--r-- | Swift/QtUI/QtMainWindow.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp index cc5119f..eaec3b6 100644 --- a/Swift/QtUI/QtChatView.cpp +++ b/Swift/QtUI/QtChatView.cpp @@ -66,10 +66,6 @@ QtChatView::QtChatView(QtChatTheme* theme, QWidget* parent, bool disableAutoScro viewReady_ = false; isAtBottom_ = true; resetView(); - - if (disableAutoScroll) { - webPage_->mainFrame()->evaluateJavaScript("var disableAutoScroll = true;"); - } } void QtChatView::handleClearRequested() { diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp index 7ec0c93..ced375f 100644 --- a/Swift/QtUI/QtMainWindow.cpp +++ b/Swift/QtUI/QtMainWindow.cpp @@ -123,9 +123,11 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr QAction* joinMUCAction = new QAction(tr("Enter &Room…"), this); connect(joinMUCAction, SIGNAL(triggered()), SLOT(handleJoinMUCAction())); actionsMenu->addAction(joinMUCAction); +#ifdef SWIFT_EXPERIMENTAL_HISTORY QAction* viewLogsAction = new QAction(tr("&View History…"), this); connect(viewLogsAction, SIGNAL(triggered()), SLOT(handleViewLogsAction())); actionsMenu->addAction(viewLogsAction); +#endif addUserAction_ = new QAction(tr("&Add Contact…"), this); connect(addUserAction_, SIGNAL(triggered(bool)), this, SLOT(handleAddUserActionTriggered(bool))); actionsMenu->addAction(addUserAction_); |