Merge pull request #2 from michaelxzhang/develop

updated

Author: michaelxzhang

kdiff3/src-QT4/difftextwindow.cpp

@@ -1066,6 +1066,13 @@ void DiffTextWindowData::writeLine(
       p.fillRect( xLeft, yOffset, fontWidth*2-1, fontHeight, c==m_pOptions->m_fgColor ? bgColor : c );
    }
 
+   //if no line then we fill a rectangle with pattern
+   if (srcLineIdx < 0)
+   {
+       p.setPen( QPen( Qt::gray, 1, Qt::DashLine) );
+       p.fillRect(xOffset + fontWidth-1, yOffset, p.window().width(), fontHeight, QBrush(Qt::lightGray, Qt::BDiagPattern));
+   }
+
    if ( bFastSelectionRange )
    {
       p.fillRect( xOffset + fontWidth-1, yOffset, 3, fontHeight, m_pOptions->m_fgColor );
@@ -1075,14 +1082,6 @@ void DiffTextWindowData::writeLine(
       int currSelectionyOffset = (fastSelectorLine1 - m_firstLine) * fontHeight;
       p.drawLine( xOffset + 6, currSelectionyOffset, p.window().width(), currSelectionyOffset );
       p.drawLine( xOffset + 6, currSelectionyOffset + (m_fastSelectorNofLines) *fontHeight-1, p.window().width(), currSelectionyOffset + (m_fastSelectorNofLines) *fontHeight-1);
-
-      //if no line then we fill a rectangle with pattern
-      if (srcLineIdx < 0)
-      {
-          p.setPen( QPen( Qt::green, 1, Qt::DashLine) );
-          int currSelectionyOffset = (fastSelectorLine1 - m_firstLine) * fontHeight;
-          p.fillRect(xOffset + 6, currSelectionyOffset, p.window().width(), (m_fastSelectorNofLines) *fontHeight-1, Qt::BDiagPattern);
-      }
    }
 
    // Check if line needs a manual diff help mark

kdiff3/src-QT4/mergeresultwindow.cpp

@@ -1853,6 +1853,20 @@ void MergeResultWindow::writeLine(
       p.drawLine( xOffset+2, yOffset, xOffset+2, yOffset+fontHeight-1 );
       p.drawLine( xOffset+3, yOffset, xOffset+3, yOffset+fontHeight-1 );*/
    }
+
+   if (( rangeMark & 4 ) && ( rangeMark & 1))
+   {
+      //put a line at top and bottom of the current selected range
+      p.setPen( QPen( Qt::blue, 1, Qt::DashLine) );
+      p.drawLine( xOffset + 2, yOffset, p.window().width(), yOffset );
+   }
+
+   if (( rangeMark & 4 ) && ( rangeMark & 2))
+   {
+      //put a line at top and bottom of the current selected range
+      p.setPen( QPen( Qt::blue, 1, Qt::DashLine) );
+      p.drawLine( xOffset + 2, yOffset + fontHeight, p.window().width(), yOffset + fontHeight );
+   }
 }
 
 void MergeResultWindow::setPaintingAllowed(bool bPaintingAllowed)

kdiff3/src-QT4/optiondialog.cpp

@@ -682,7 +682,7 @@ void OptionDialog::setupColorPage( void )
   ++line;
 
   OptionColorButton* pDiffBgColor = new OptionColorButton( 
-     bLowColor ? QColor(Qt::lightGray) : qRgb(224,224,224), "DiffBgColor", &m_options.m_diffBgColor, page, this );
+     bLowColor ? QColor(Qt::lightGray) : qRgb(255,205,189), "DiffBgColor", &m_options.m_diffBgColor, page, this );
   label = new QLabel( i18n("Diff background color:"), page );
   label->setBuddy(pDiffBgColor);
   gbox->addWidget( label, line, 0 );
@@ -720,16 +720,15 @@ void OptionDialog::setupColorPage( void )
   gbox->addWidget( pColorForConflict, line, 1 );
   ++line;
 
-  OptionColorButton* pColor = new OptionColorButton( 
-     bLowColor ? qRgb(192,192,192) : qRgb(220,220,100), "CurrentRangeBgColor", &m_options.m_currentRangeBgColor, page, this );
+  OptionColorButton* pColor = new OptionColorButton( Qt::white, "CurrentRangeBgColor", &m_options.m_currentRangeBgColor, page, this );
   label = new QLabel( i18n("Current range background color:"), page );
   label->setBuddy(pColor);
   gbox->addWidget( label, line, 0 );
   gbox->addWidget( pColor, line, 1 );
   ++line;
 
   pColor = new OptionColorButton( 
-     bLowColor ? qRgb(255,255,0) : qRgb(255,255,150), "CurrentRangeDiffBgColor", &m_options.m_currentRangeDiffBgColor, page, this );
+     bLowColor ? qRgb(255,255,0) : qRgb(255,205,189), "CurrentRangeDiffBgColor", &m_options.m_currentRangeDiffBgColor, page, this );
   label = new QLabel( i18n("Current range diff background color:"), page );
   label->setBuddy(pColor);
   gbox->addWidget( label, line, 0 );