fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-03-12 01:03 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* contrib/hbqt/hbqt_hbqplaintextedit.cpp
  * contrib/hbqt/hbqt_hbqplaintextedit.h
    ! Fixed behavior of book-marks. Now color representation 
      on bookmarked lines is persistent and consistent with 
      corresponding buttons in the statusbar.
This commit is contained in:
Pritpal Bedi
2010-03-12 09:08:06 +00:00
parent 805f3b55e8
commit 93e56f88a3
3 changed files with 76 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-03-12 01:03 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/hbqt_hbqplaintextedit.cpp
* contrib/hbqt/hbqt_hbqplaintextedit.h
! Fixed behavior of book-marks. Now color representation
on bookmarked lines is persistent and consistent with
corresponding buttons in the statusbar.
2010-03-12 02:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbssl/evpmd.c
! Disabled md2 support for >= 1.0.0 OpenSSL versions.

107
harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
View File

@@ -261,52 +261,76 @@ void HBQPlainTextEdit::paintEvent( QPaintEvent * event )
{
QPainter painter( viewport() );
if( m_currentLineColor.isValid() )
int curBlock = textCursor().blockNumber();
QTextBlock block = firstVisibleBlock();
int blockNumber = block.blockNumber();
int height = ( int ) blockBoundingRect( block ).height();
int top = ( int ) blockBoundingGeometry( block ).translated( contentOffset() ).top();
int bottom = top + height;
while( block.isValid() && top <= event->rect().bottom() )
{
QRect r = HBQPlainTextEdit::cursorRect();
r.setX( 0 );
r.setWidth( viewport()->width() );
int index = bookMark.indexOf( textCursor().blockNumber() + 1 );
if( index != -1 )
if( block.isVisible() && bottom >= event->rect().top() )
{
QBrush br = QBrush( m_currentLineColor );
if( index == 0 )
br = QBrush( QColor( 255, 255, 127 ) );
else if( index == 1 )
br = QBrush( QColor( 175, 175, 255 ) );
else if( index == 2 )
br = QBrush( QColor( 255, 175, 175 ) );
else if( index == 3 )
br = QBrush( QColor( 175, 255, 175 ) );
else if( index == 4 )
br = QBrush( QColor( 255, 190, 125 ) );
else if( index == 5 )
br = QBrush( QColor( 175, 255, 255 ) );
else
br = QBrush( m_currentLineColor );
painter.fillRect( r, br );
int index = bookMarksGoto.indexOf( blockNumber + 1 );
if( index != -1 )
{
QRect r( 0, top, viewport()->width(), height );
painter.fillRect( r, brushForBookmark( index ) );
}
else if( curBlock == blockNumber && m_currentLineColor.isValid() )
{
if( highlightCurLine == true )
{
QRect r = HBQPlainTextEdit::cursorRect();
r.setX( 0 );
r.setWidth( viewport()->width() );
painter.fillRect( r, QBrush( m_currentLineColor ) );
}
}
}
else if( highlightCurLine == true )
painter.fillRect( r, QBrush( m_currentLineColor ) );
block = block.next();
top = bottom;
bottom = top + height;//( int ) blockBoundingRect( block ).height();
++blockNumber;
}
this->hbPaintColumnSelection( event );
painter.end();
QPlainTextEdit::paintEvent( event );
}
QBrush HBQPlainTextEdit::brushForBookmark( int index )
{
QBrush br;
if( index == 0 )
br = QBrush( QColor( 255, 255, 127 ) );
else if( index == 1 )
br = QBrush( QColor( 175, 175, 255 ) );
else if( index == 2 )
br = QBrush( QColor( 255, 175, 175 ) );
else if( index == 3 )
br = QBrush( QColor( 175, 255, 175 ) );
else if( index == 4 )
br = QBrush( QColor( 255, 190, 125 ) );
else if( index == 5 )
br = QBrush( QColor( 175, 255, 255 ) );
else
br = QBrush( m_currentLineColor );
return br;
}
void HBQPlainTextEdit::lineNumberAreaPaintEvent( QPaintEvent *event )
{
QPainter painter( lineNumberArea );
painter.fillRect( event->rect(), m_lineAreaBkColor );
QTextBlock block = firstVisibleBlock();
int blockNumber = block.blockNumber();
int top = ( int ) blockBoundingGeometry( block ).translated( contentOffset() ).top();
int bottom = top +( int ) blockBoundingRect( block ).height();
int blockNumber = block.blockNumber();
int top = ( int ) blockBoundingGeometry( block ).translated( contentOffset() ).top();
int bottom = top +( int ) blockBoundingRect( block ).height();
while( block.isValid() && top <= event->rect().bottom() )
{
@@ -315,24 +339,26 @@ void HBQPlainTextEdit::lineNumberAreaPaintEvent( QPaintEvent *event )
QString number = QString::number( blockNumber + 1 );
painter.setPen( ( blockNumber + 1 ) % 10 == 0 ? Qt::red : Qt::black );
painter.drawText( 0, top, lineNumberArea->width()-2, fontMetrics().height(), Qt::AlignRight, number );
int index = bookMark.indexOf( number.toInt() );
int index = bookMarksGoto.indexOf( number.toInt() );
if( index != -1 )
{
//painter.drawText( 0, top, 30, fontMetrics().height(), Qt::AlignCenter, "+" );
painter.setBrush( QBrush( Qt::yellow, Qt::SolidPattern ) );
painter.drawEllipse( 5, top +( fontMetrics().height()/4 ),
//painter.setBrush( QBrush( Qt::yellow, Qt::SolidPattern ) );
painter.setBrush( brushForBookmark( index ) );
#if 0
painter.drawEllipse( 5, top + ( fontMetrics().height()/4 ),
fontMetrics().height()/2, fontMetrics().height()/2 );
#endif
painter.drawRect( 5, top+2, fontMetrics().height()-4, fontMetrics().height()-4 );
}
}
block = block.next();
top = bottom;
block = block.next();
top = bottom;
bottom = top +( int ) blockBoundingRect( block ).height();
++blockNumber;
}
}
void HBQPlainTextEdit::hbBookmarks( int block )
{
int found = bookMark.indexOf( block );
@@ -342,7 +368,9 @@ void HBQPlainTextEdit::hbBookmarks( int block )
qSort( bookMark );
}
else
{
bookMark.remove( found );
}
found = -1;
int i = 0;
@@ -357,8 +385,9 @@ void HBQPlainTextEdit::hbBookmarks( int block )
}
if( found == -1 )
{
bookMarksGoto.append( block );
}
lineNumberArea->repaint();
update();
}

1
harbour/contrib/hbqt/hbqt_hbqplaintextedit.h
View File

@@ -128,6 +128,7 @@ private:
bool isColumnSelectionEnabled;
bool isTipActive;
QCompleter * c;
QBrush brushForBookmark( int index );
protected:
bool event( QEvent * event );