|
|
|
@ -638,14 +638,14 @@ void KDiff3App::initView()
|
|
|
|
|
TQVBoxLayout* pVLayout = new TQVBoxLayout(m_pMainWidget,0,0);
|
|
|
|
|
|
|
|
|
|
TQSplitter* pVSplitter = new TQSplitter( m_pMainWidget );
|
|
|
|
|
pVSplitter->setOrientation( Qt::Vertical );
|
|
|
|
|
pVSplitter->setOrientation( TQt::Vertical );
|
|
|
|
|
pVLayout->addWidget( pVSplitter );
|
|
|
|
|
|
|
|
|
|
TQWidget* pDiffWindowFrame = new TQWidget( pVSplitter );
|
|
|
|
|
TQHBoxLayout* pDiffHLayout = new TQHBoxLayout( pDiffWindowFrame,0,0 );
|
|
|
|
|
|
|
|
|
|
m_pDiffWindowSplitter = new TQSplitter( pDiffWindowFrame );
|
|
|
|
|
m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical );
|
|
|
|
|
m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? TQt::Horizontal : TQt::Vertical );
|
|
|
|
|
pDiffHLayout->addWidget( m_pDiffWindowSplitter );
|
|
|
|
|
|
|
|
|
|
m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog );
|
|
|
|
@ -653,7 +653,7 @@ void KDiff3App::initView()
|
|
|
|
|
connect( m_pOverview, TQT_SIGNAL(setLine(int)), this, TQT_SLOT(setDiff3Line(int)) );
|
|
|
|
|
//connect( m_pOverview, TQT_SIGNAL(afterFirstPaint()), this, TQT_SLOT(slotAfterFirstPaint()));
|
|
|
|
|
|
|
|
|
|
m_pDiffVScrollBar = new TQScrollBar( Qt::Vertical, pDiffWindowFrame );
|
|
|
|
|
m_pDiffVScrollBar = new TQScrollBar( TQt::Vertical, pDiffWindowFrame );
|
|
|
|
|
pDiffHLayout->addWidget( m_pDiffVScrollBar );
|
|
|
|
|
|
|
|
|
|
m_pDiffTextWindowFrame1 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 1 );
|
|
|
|
@ -679,7 +679,7 @@ void KDiff3App::initView()
|
|
|
|
|
m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog, statusBar() );
|
|
|
|
|
pMergeVLayout->addWidget( m_pMergeResultWindow, 1 );
|
|
|
|
|
|
|
|
|
|
m_pMergeVScrollBar = new TQScrollBar( Qt::Vertical, m_pMergeWindowFrame );
|
|
|
|
|
m_pMergeVScrollBar = new TQScrollBar( TQt::Vertical, m_pMergeWindowFrame );
|
|
|
|
|
pMergeHLayout->addWidget( m_pMergeVScrollBar );
|
|
|
|
|
|
|
|
|
|
autoAdvance->setEnabled(true);
|
|
|
|
@ -693,7 +693,7 @@ void KDiff3App::initView()
|
|
|
|
|
m_pMergeResultWindow->installEventFilter( m_pMergeResultWindowTitle ); // for focus tracking
|
|
|
|
|
|
|
|
|
|
TQHBoxLayout* pHScrollBarLayout = new TQHBoxLayout( pVLayout );
|
|
|
|
|
m_pHScrollBar = new ReversibleScrollBar( Qt::Horizontal, m_pMainWidget, &m_pOptionDialog->m_bRightToLeftLanguage );
|
|
|
|
|
m_pHScrollBar = new ReversibleScrollBar( TQt::Horizontal, m_pMainWidget, &m_pOptionDialog->m_bRightToLeftLanguage );
|
|
|
|
|
pHScrollBarLayout->addWidget( m_pHScrollBar );
|
|
|
|
|
m_pCornerWidget = new TQWidget( m_pMainWidget );
|
|
|
|
|
pHScrollBarLayout->addWidget( m_pCornerWidget );
|
|
|
|
@ -1434,7 +1434,7 @@ void KDiff3App::slotRefresh()
|
|
|
|
|
}
|
|
|
|
|
if ( m_pDiffWindowSplitter!=0 )
|
|
|
|
|
{
|
|
|
|
|
m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical );
|
|
|
|
|
m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? TQt::Horizontal : TQt::Vertical );
|
|
|
|
|
}
|
|
|
|
|
if ( m_pDirectoryMergeWindow )
|
|
|
|
|
{
|
|
|
|
@ -2032,10 +2032,10 @@ void KDiff3App::slotWinToggleSplitterOrientation()
|
|
|
|
|
if ( m_pDiffWindowSplitter!=0 )
|
|
|
|
|
{
|
|
|
|
|
m_pDiffWindowSplitter->setOrientation(
|
|
|
|
|
m_pDiffWindowSplitter->orientation()==Qt::Vertical ? Qt::Horizontal : Qt::Vertical
|
|
|
|
|
m_pDiffWindowSplitter->orientation()==TQt::Vertical ? TQt::Horizontal : TQt::Vertical
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==Qt::Horizontal;
|
|
|
|
|
m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==TQt::Horizontal;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|