Changeset View
Changeset View
Standalone View
Standalone View
src/pdiff.cpp
Show First 20 Lines • Show All 635 Lines • ▼ Show 20 Line(s) | 535 | { | |||
---|---|---|---|---|---|
636 | m_pCornerWidget = new QWidget(m_pMainWidget); | 636 | m_pCornerWidget = new QWidget(m_pMainWidget); | ||
637 | pHScrollBarLayout->addWidget(m_pCornerWidget); | 637 | pHScrollBarLayout->addWidget(m_pCornerWidget); | ||
638 | 638 | | |||
639 | connect(m_pDiffVScrollBar, &QScrollBar::valueChanged, m_pOverview, &Overview::setFirstLine); | 639 | connect(m_pDiffVScrollBar, &QScrollBar::valueChanged, m_pOverview, &Overview::setFirstLine); | ||
640 | connect(m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstLine(int))); | 640 | connect(m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow1, SLOT(setFirstLine(int))); | ||
641 | connect(m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, SLOT(setHorizScrollOffset(int))); | 641 | connect(m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, SLOT(setHorizScrollOffset(int))); | ||
642 | connect(m_pDiffTextWindow1, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); | 642 | connect(m_pDiffTextWindow1, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); | ||
643 | connect(m_pDiffTextWindow1, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); | 643 | connect(m_pDiffTextWindow1, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); | ||
644 | connect(m_pDiffTextWindow1, SIGNAL(scrollDiffTextWindow(int, int)), this, SLOT(scrollDiffTextWindow(int, int))); | ||||
644 | m_pDiffTextWindow1->installEventFilter(this); | 645 | m_pDiffTextWindow1->installEventFilter(this); | ||
645 | 646 | | |||
646 | connect(m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstLine(int))); | 647 | connect(m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow2, SLOT(setFirstLine(int))); | ||
647 | connect(m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, SLOT(setHorizScrollOffset(int))); | 648 | connect(m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, SLOT(setHorizScrollOffset(int))); | ||
648 | connect(m_pDiffTextWindow2, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); | 649 | connect(m_pDiffTextWindow2, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); | ||
649 | connect(m_pDiffTextWindow2, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); | 650 | connect(m_pDiffTextWindow2, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); | ||
651 | connect(m_pDiffTextWindow2, SIGNAL(scrollDiffTextWindow(int, int)), this, SLOT(scrollDiffTextWindow(int, int))); | ||||
650 | m_pDiffTextWindow2->installEventFilter(this); | 652 | m_pDiffTextWindow2->installEventFilter(this); | ||
651 | 653 | | |||
652 | connect(m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstLine(int))); | 654 | connect(m_pDiffVScrollBar, SIGNAL(valueChanged(int)), m_pDiffTextWindow3, SLOT(setFirstLine(int))); | ||
653 | connect(m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, SLOT(setHorizScrollOffset(int))); | 655 | connect(m_pHScrollBar, SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, SLOT(setHorizScrollOffset(int))); | ||
654 | connect(m_pDiffTextWindow3, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); | 656 | connect(m_pDiffTextWindow3, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); | ||
655 | connect(m_pDiffTextWindow3, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); | 657 | connect(m_pDiffTextWindow3, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); | ||
658 | connect(m_pDiffTextWindow3, SIGNAL(scrollDiffTextWindow(int, int)), this, SLOT(scrollDiffTextWindow(int, int))); | ||||
656 | m_pDiffTextWindow3->installEventFilter(this); | 659 | m_pDiffTextWindow3->installEventFilter(this); | ||
657 | 660 | | |||
658 | MergeResultWindow* p = m_pMergeResultWindow; | 661 | MergeResultWindow* p = m_pMergeResultWindow; | ||
659 | connect(m_pMergeVScrollBar, &QScrollBar::valueChanged, p, &MergeResultWindow::setFirstLine); | 662 | connect(m_pMergeVScrollBar, &QScrollBar::valueChanged, p, &MergeResultWindow::setFirstLine); | ||
660 | 663 | | |||
661 | connect(m_pHScrollBar, &ReversibleScrollBar::valueChanged2, p, &MergeResultWindow::setHorizScrollOffset); | 664 | connect(m_pHScrollBar, &ReversibleScrollBar::valueChanged2, p, &MergeResultWindow::setHorizScrollOffset); | ||
665 | connect(p, SIGNAL(scrollMergeResultWindow(int, int)), this, SLOT(scrollMergeResultWindow(int, int))); | ||||
662 | connect(p, SIGNAL(sourceMask(int, int)), this, SLOT(sourceMask(int, int))); | 666 | connect(p, SIGNAL(sourceMask(int, int)), this, SLOT(sourceMask(int, int))); | ||
663 | connect(p, SIGNAL(resizeSignal()), this, SLOT(resizeMergeResultWindow())); | 667 | connect(p, SIGNAL(resizeSignal()), this, SLOT(resizeMergeResultWindow())); | ||
664 | connect(p, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); | 668 | connect(p, SIGNAL(selectionEnd()), this, SLOT(slotSelectionEnd())); | ||
665 | connect(p, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); | 669 | connect(p, SIGNAL(newSelection()), this, SLOT(slotSelectionStart())); | ||
666 | connect(p, SIGNAL(modifiedChanged(bool)), this, SLOT(slotOutputModified(bool))); | 670 | connect(p, SIGNAL(modifiedChanged(bool)), this, SLOT(slotOutputModified(bool))); | ||
667 | connect(p, &MergeResultWindow::modifiedChanged, m_pMergeResultWindowTitle, &WindowTitleWidget::slotSetModified); | 671 | connect(p, &MergeResultWindow::modifiedChanged, m_pMergeResultWindowTitle, &WindowTitleWidget::slotSetModified); | ||
668 | connect(p, SIGNAL(updateAvailabilities()), this, SLOT(slotUpdateAvailabilities())); | 672 | connect(p, SIGNAL(updateAvailabilities()), this, SLOT(slotUpdateAvailabilities())); | ||
669 | connect(p, SIGNAL(showPopupMenu(const QPoint&)), this, SLOT(showPopupMenu(const QPoint&))); | 673 | connect(p, SIGNAL(showPopupMenu(const QPoint&)), this, SLOT(showPopupMenu(const QPoint&))); | ||
▲ Show 20 Lines • Show All 1847 Lines • Show Last 20 Lines |