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

2012-08-23 10:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbide/edit.prg
  * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
  * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
    * Optimizations: exlanation in next commit.
This commit is contained in:
Pritpal Bedi
2012-08-23 17:58:27 +00:00
parent 6a7e1752f6
commit 3db7669472
4 changed files with 84 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -16,6 +16,12 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-08-23 10:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/edit.prg
* contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
* contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
* Optimizations: exlanation in next commit.
2012-08-22 19:03 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
! Refined: the way bookmarks were published. Now line-area's

6
harbour/contrib/hbide/edit.prg
View File

@@ -1231,9 +1231,11 @@ METHOD IdeEdit:handleTab( key )
FOR i := nT TO nB
cLine := ::getLine( i + 1 )
IF key == Qt_Key_Tab
cLine := substr( cLine, 1, nCol ) + cComment + substr( cLine, nCol + 1 )
//cLine := substr( cLine, 1, nCol ) + cComment + substr( cLine, nCol + 1 )
cLine := substr( cLine, 1, nL ) + cComment + substr( cLine, nL + 1 )
ELSE
cLine := substr( cLine, 1, nCol - 3 ) + substr( cLine, nCol + 1 )
//cLine := substr( cLine, 1, nCol - 3 ) + substr( cLine, nCol + 1 )
cLine := substr( cLine, 1, nL - 3 ) + substr( cLine, nL + 1 )
ENDIF
hbide_qReplaceLine( qCursor, i, cLine )
NEXT

115
harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
View File

@@ -133,6 +133,8 @@ HBQPlainTextEdit::HBQPlainTextEdit( QWidget * parent ) : QPlainTextEdit( parent
clickPos = QPoint();
iClicks = 0;
mouseMode = mouseMode_none;
m_currentBlockNumber = -1;
m_braceHiliteColor = QColor( Qt::yellow ).lighter( 160 );
connect( this, SIGNAL( blockCountChanged( int ) ) , this, SLOT( hbUpdateLineNumberAreaWidth( int ) ) );
connect( this, SIGNAL( updateRequest( const QRect &, int ) ), this, SLOT( hbUpdateLineNumberArea( const QRect &, int ) ) );
@@ -2278,8 +2280,14 @@ int HBQPlainTextEdit::hbGetLine( const QTextCursor &crQTextCursor )
void HBQPlainTextEdit::hbSlotCursorPositionChanged()
{
if( m_currentLineColor.isValid() )
viewport()->update();
if( m_currentBlockNumber != textCursor().blockNumber() )
{
m_currentBlockNumber = textCursor().blockNumber();
if( m_currentLineColor.isValid() )
{
viewport()->update();
}
}
if( styleHightlighter != "none" )
hbBraceHighlight();
@@ -2705,51 +2713,72 @@ void HBQPlainTextEdit::hbDuplicateLine()
void HBQPlainTextEdit::hbBraceHighlight()
{
QColor lineColor = QColor( Qt::yellow ).lighter( 160 );
QTextDocument *doc = document();
extraSelections.clear();
setExtraSelections( extraSelections );
selection.format.setBackground( lineColor );
selection.format.setBackground( m_braceHiliteColor );
QTextCursor cursor = textCursor();
cursor.movePosition( QTextCursor::NextCharacter, QTextCursor::KeepAnchor );
QString brace = cursor.selectedText();
if( ( brace != "{" ) && ( brace != "}" )
&& ( brace != "[" ) && ( brace != "]" )
&& ( brace != "(" ) && ( brace != ")" )
&& ( brace != "<" ) && ( brace != ">" ) )
if( ( brace == "{" ) || ( brace == "}" )
|| ( brace == "[" ) || ( brace == "]" )
|| ( brace == "(" ) || ( brace == ")" )
|| ( brace == "<" ) || ( brace == ">" ) )
{
return;
}
QString openBrace;
QString closeBrace;
QString openBrace;
QString closeBrace;
if( ( brace == "{" ) || ( brace == "}" ) )
{
openBrace = "{";
closeBrace = "}";
}
if( ( brace == "[" ) || ( brace == "]" ) )
{
openBrace = "[";
closeBrace = "]";
}
if( ( brace == "(" ) || ( brace == ")" ) )
{
openBrace = "(";
closeBrace = ")";
}
if( ( brace == "<" ) || ( brace == ">" ) )
{
openBrace = "<";
closeBrace = ">";
}
matchPair( cursor, brace, openBrace, closeBrace, m_matchBracesAll, 0 );
}
else
{
cursor = textCursor();
cursor.select( QTextCursor::WordUnderCursor );
QString brace = cursor.selectedText();
//cursor.movePosition( QTextCursor::NextCharacter, QTextCursor::MoveAnchor );
if( ( brace == "{" ) || ( brace == "}" ) )
{
openBrace = "{";
closeBrace = "}";
}
if( ( brace == "[" ) || ( brace == "]" ) )
{
openBrace = "[";
closeBrace = "]";
}
if( ( brace == "(" ) || ( brace == ")" ) )
{
openBrace = "(";
closeBrace = ")";
}
if( ( brace == "<" ) || ( brace == ">" ) )
{
openBrace = "<";
closeBrace = ">";
}
if( brace == "IF" || brace == "ENDIF" )
{
QString openBrace;
QString closeBrace;
if( ( brace == "IF" ) || ( brace == "ENDIF" ) )
{
openBrace = "IF";
closeBrace = "ENDIF";
}
matchPair( cursor, brace, openBrace, closeBrace, true, QTextDocument::FindWholeWords );
}
}
}
/*----------------------------------------------------------------------*/
void HBQPlainTextEdit::matchPair( QTextCursor cursor, QString brace, QString openBrace, QString closeBrace, bool bBraceAll, QTextDocument::FindFlags flags )
{
QTextDocument *doc = document();
QTextCursor cursor1;
QTextCursor cursor2;
QTextCursor matches;
@@ -2766,8 +2795,8 @@ void HBQPlainTextEdit::hbBraceHighlight()
{
while( cursor1.position() > cursor2.position() )
{
cursor1 = doc->find( closeBrace, cursor1 );
cursor2 = doc->find( openBrace, cursor2 );
cursor1 = doc->find( closeBrace, cursor1, flags );
cursor2 = doc->find( openBrace, cursor2, flags );
if( cursor2.isNull() )
break;
}
@@ -2778,8 +2807,8 @@ void HBQPlainTextEdit::hbBraceHighlight()
{
if( brace == closeBrace )
{
cursor1 = doc->find( openBrace, cursor, QTextDocument::FindBackward );
cursor2 = doc->find( closeBrace, cursor, QTextDocument::FindBackward );
cursor1 = doc->find( openBrace, cursor, QTextDocument::FindBackward | flags );
cursor2 = doc->find( closeBrace, cursor, QTextDocument::FindBackward | flags );
if( cursor2.isNull() )
{
matches = cursor1;
@@ -2788,8 +2817,8 @@ void HBQPlainTextEdit::hbBraceHighlight()
{
while( cursor1.position() < cursor2.position() )
{
cursor1 = doc->find( openBrace, cursor1, QTextDocument::FindBackward );
cursor2 = doc->find( closeBrace, cursor2, QTextDocument::FindBackward );
cursor1 = doc->find( openBrace, cursor1, QTextDocument::FindBackward | flags );
cursor2 = doc->find( closeBrace, cursor2, QTextDocument::FindBackward | flags );
if( cursor2.isNull() )
break;
}
@@ -2799,7 +2828,7 @@ void HBQPlainTextEdit::hbBraceHighlight()
}
if( ! matches.isNull() )
{
if( m_matchBracesAll )
if( bBraceAll )
{
selection.cursor = cursor;
extraSelections.append( selection );
@@ -2809,6 +2838,4 @@ void HBQPlainTextEdit::hbBraceHighlight()
setExtraSelections( extraSelections );
}
}
/*----------------------------------------------------------------------*/
#endif

9
harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
View File

@@ -97,6 +97,8 @@ public:
long m_matchingBegin;
long m_matchingEnd;
bool m_matchBracesAll;
int m_currentBlockNumber;
QColor m_braceHiliteColor;
void paintEvent( QPaintEvent * event );
void lineNumberAreaPaintEvent( QPaintEvent * event );
@@ -135,12 +137,6 @@ private:
QList<int> bookMarksGoto;
QWidget * lineNumberArea;
QFrame * horzRuler;
#if 0
QFrame * ttFrame;
QVBoxLayout * ttLayout;
QLabel * ttLabel;
QTextEdit * ttTextEdit;
#endif
int spaces;
bool numberBlock;
bool highlightCurLine;
@@ -245,6 +241,7 @@ public slots:
void hbRefreshCompleter( const QString & alias = "" );
void hbToggleCodeCompetion() { isCodeCompletionActive = ! isCodeCompletionActive; };
void hbToggleCompetionTips() { isCompletionTipsActive = ! isCompletionTipsActive; };
void matchPair( QTextCursor cursor, QString brace, QString openBrace, QString closeBrace, bool bBraceAll, QTextDocument::FindFlags flags );
private slots:
void hbSlotCursorPositionChanged();