diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2013-06-03 12:32:07 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2013-06-04 11:14:06 +0200 |
commit | aa0533c969841f530977e89ee96e351d6f1f25eb (patch) | |
tree | 6cbcffbad7b564ef6f331ba72b6fbffc3b6e0ae4 /src/plugins/diffeditor/diffeditorwidget.cpp | |
parent | 36bec480ae6ddc1ae0e545e91f21e76b06299a29 (diff) | |
download | qt-creator-aa0533c969841f530977e89ee96e351d6f1f25eb.tar.gz |
Move "Sync Horiz Scroll Bars" corner widget to the toolbar
Change-Id: Ie97ae07b02499b4d8d80e006aa77ca3b802f39b3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidget.cpp')
-rw-r--r-- | src/plugins/diffeditor/diffeditorwidget.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidget.cpp b/src/plugins/diffeditor/diffeditorwidget.cpp index 0214142790..31256f3f3a 100644 --- a/src/plugins/diffeditor/diffeditorwidget.cpp +++ b/src/plugins/diffeditor/diffeditorwidget.cpp @@ -533,15 +533,6 @@ DiffEditorWidget::DiffEditorWidget(QWidget *parent) { TextEditor::TextEditorSettings *settings = TextEditorSettings::instance(); - QToolButton *toggleSync = new QToolButton(); - toggleSync = new QToolButton; - toggleSync->setText(QLatin1String("S")); - toggleSync->setCheckable(true); - toggleSync->setChecked(m_syncScrollBars); - toggleSync->setToolTip(tr("Synchronize Horizontal Scroll Bars")); - toggleSync->setAutoRaise(true); - connect(toggleSync, SIGNAL(clicked(bool)), this, SLOT(toggleScrollBarSynchronization(bool))); - m_leftEditor = new DiffViewEditorWidget(this); m_leftEditor->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_leftEditor->setReadOnly(true); @@ -554,7 +545,6 @@ DiffEditorWidget::DiffEditorWidget(QWidget *parent) m_leftEditor->setCodeStyle(settings->codeStyle()); m_rightEditor = new DiffViewEditorWidget(this); - m_rightEditor->setCornerWidget(toggleSync); m_rightEditor->setReadOnly(true); connect(settings, SIGNAL(fontSettingsChanged(TextEditor::FontSettings)), m_rightEditor, SLOT(setFontSettings(TextEditor::FontSettings))); @@ -1423,7 +1413,7 @@ void DiffEditorWidget::rightDocumentSizeChanged() synchronizeFoldings(m_rightEditor, m_leftEditor); } -void DiffEditorWidget::toggleScrollBarSynchronization(bool on) +void DiffEditorWidget::setHorizontalScrollBarSynchronization(bool on) { m_syncScrollBars = on; } |