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

2010-01-15 02:13 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* contrib/hbide/hbide.prg
  * contrib/hbide/ideeditor.prg
  * contrib/hbide/idesources.prg
  * contrib/hbqt/hbqt.h
  * contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
  * contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
  * contrib/hbqt/hbqt_hbslots.cpp
    + Implemented "Set Mark" and "Goto Mark" toolbar actions.
      This implementation has a little glitch which I am lookking
      to be realized with subclassing. But the prototype is in place.

    ! Fixed a bug reported by Marco Bra.
This commit is contained in:
Pritpal Bedi
2010-01-15 10:19:32 +00:00
parent a8dac18c1e
commit e4f55f694f
8 changed files with 245 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -17,6 +17,20 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-15 02:13 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbide/hbide.prg
* contrib/hbide/ideeditor.prg
* contrib/hbide/idesources.prg
* contrib/hbqt/hbqt.h
* contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
* contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
* contrib/hbqt/hbqt_hbslots.cpp
+ Implemented "Set Mark" and "Goto Mark" toolbar actions.
This implementation has a little glitch which I am lookking
to be realized with subclassing. But the prototype is in place.
! Fixed a bug reported by Marco Bra.
2010-01-14 18:21 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbide/hbide.ch
* contrib/hbide/hbide.prg

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

@@ -482,11 +482,11 @@ METHOD HbIde:execAction( cKey )
::oFR:show()
ENDIF
CASE cKey == "SetMark"
//
::oEM:setMark()
CASE cKey == "GotoMark"
//
::oEM:gotoMark()
CASE cKey == "Goto"
::oEM:goto()
::oEM:goTo()
CASE cKey == "ToUpper"
::oEM:convertSelection( cKey )
CASE cKey == "ToLower"

203
harbour/contrib/hbide/ideeditor.prg
View File

@@ -98,11 +98,12 @@ CLASS IdeEditsManager INHERIT IdeObject
METHOD prepareTabWidget()
METHOD removeSourceInTree( cSourceFile )
METHOD addSourceInTree( cSourceFile )
METHOD exeBlock( nMode, p )
METHOD exeEvent( nMode, p )
METHOD buildEditor( cSourceFile, nPos, nHPos, nVPos, cTheme )
METHOD getTabBySource( cSource )
METHOD getTabCurrent()
METHOD getDocumentCurrent()
METHOD getEditObjectCurrent()
METHOD getEditCurrent()
METHOD getEditorCurrent()
METHOD getEditorByIndex( nIndex )
@@ -125,6 +126,8 @@ CLASS IdeEditsManager INHERIT IdeObject
METHOD zoom( cKey )
METHOD printPreview()
METHOD paintRequested( pPrinter )
METHOD setMark()
METHOD gotoMark()
METHOD goto()
ENDCLASS
@@ -184,7 +187,7 @@ METHOD IdeEditsManager:prepareTabWidget()
::qTabWidget:setMovable( .t. )
::qTabWidget:setContextMenuPolicy( Qt_CustomContextMenu )
::connect( ::qTabWidget, "customContextMenuRequested(QPoint)", {|o,p| ::exeBlock( 1, p, o ) } )
::connect( ::qTabWidget, "customContextMenuRequested(QPoint)", {|o,p| ::exeEvent( 1, p, o ) } )
RETURN Self
@@ -229,7 +232,7 @@ METHOD IdeEditsManager:addSourceInTree( cSourceFile )
/*----------------------------------------------------------------------*/
METHOD IdeEditsManager:exeBlock( nMode, p )
METHOD IdeEditsManager:exeEvent( nMode, p )
//LOCAL qObj
HB_SYMBOL_UNUSED( p )
@@ -289,13 +292,27 @@ METHOD IdeEditsManager:getDocumentCurrent()
/*----------------------------------------------------------------------*/
METHOD IdeEditsManager:getEditObjectCurrent()
LOCAL qTab, nTab
IF ::qTabWidget:count() > 0
qTab := ::qTabWidget:currentWidget()
IF ( nTab := ascan( ::aTabs, {|e_| hbqt_IsEqualGcQtPointer( e_[ TAB_OTAB ]:oWidget:pPtr, qTab ) } ) ) > 0
RETURN ::aTabs[ nTab, TAB_OEDITOR ]:qCoEdit
ENDIF
ENDIF
RETURN Nil
/*----------------------------------------------------------------------*/
METHOD IdeEditsManager:getEditCurrent()
LOCAL qTab, nTab
IF ::qTabWidget:count() > 0
qTab := ::qTabWidget:currentWidget()
IF ( nTab := ascan( ::aTabs, {|e_| hbqt_IsEqualGcQtPointer( e_[ TAB_OTAB ]:oWidget:pPtr, qTab ) } ) ) > 0
RETURN ::aTabs[ nTab, TAB_OEDITOR ]:qCurEditSplit
RETURN ::aTabs[ nTab, TAB_OEDITOR ]:qCqEdit
ENDIF
ENDIF
@@ -531,7 +548,7 @@ METHOD IdeEditsManager:insertText( cKey )
cText := hbide_getUniqueFuncName()
CASE cKey == "InsertExternalFile"
cFile := ::selectSource( "open" )
cFile := ::oSM:selectSource( "open" )
IF Empty( cFile ) .OR. !hb_FileExists( cFile )
RETURN Self
ENDIF
@@ -603,21 +620,44 @@ METHOD IdeEditsManager:paintRequested( pPrinter )
/*----------------------------------------------------------------------*/
METHOD IdeEditsManager:goto()
LOCAL qGo, nLine, qCursor, oEdit
METHOD IdeEditsManager:setMark()
LOCAL oEdit
IF empty( oEdit := ::oEM:getEditCurrent() )
IF !empty( oEdit := ::getEditObjectCurrent() )
oEdit:setNewMark()
ENDIF
RETURN Self
/*----------------------------------------------------------------------*/
METHOD IdeEditsManager:gotoMark()
LOCAL oEdit
IF !empty( oEdit := ::getEditObjectCurrent() )
oEdit:gotoLastMark()
ENDIF
RETURN Self
/*----------------------------------------------------------------------*/
METHOD IdeEditsManager:goto()
LOCAL qGo, nLine, qCursor, qEdit, nRows
IF empty( qEdit := ::oEM:getEditCurrent() )
RETURN Self
ENDIF
qCursor := QTextCursor():configure( oEdit:textCursor() )
qCursor := QTextCursor():configure( qEdit:textCursor() )
nLine := qCursor:blockNumber()
nRows := qEdit:blockCount()
qGo := QInputDialog():new( ::oDlg:oWidget )
qGo:setIntMinimum( 1 )
qGo:setIntMaximum( oEdit:blockCount() )
qGo:setIntMaximum( nRows )
qGo:setIntValue( nLine + 1 )
qGo:setLabelText( "Goto Line Number [1-" + hb_ntos( oEdit:blockCount() ) + "]" )
qGo:setLabelText( "Goto Line Number [1-" + hb_ntos( nRows ) + "]" )
qGo:setWindowTitle( "Harbour-Qt" )
::setPosByIni( qGo, GotoDialogGeometry )
@@ -633,7 +673,7 @@ METHOD IdeEditsManager:goto()
ELSEIF nLine > 0
qCursor:movePosition( QTextCursor_Down, QTextCursor_MoveAnchor, nLine - 1 )
ENDIF
oEdit:setTextCursor( qCursor )
qEdit:setTextCursor( qCursor )
RETURN nLine
@@ -662,7 +702,8 @@ CLASS IdeEditor INHERIT IdeObject
DATA aEdits INIT {} /* Hold IdeEdit Objects */
DATA oEdit
DATA qEdit
DATA qCurEditSplit
DATA qCqEdit
DATA qCoEdit
DATA nBlock INIT -1
DATA nColumn INIT -1
@@ -751,8 +792,9 @@ METHOD IdeEditor:create( oIde, cSourceFile, nPos, nHPos, nVPos, cTheme )
::oTab:oWidget:setLayout( ::qLayout )
::oEdit := IdeEdit():new( Self, 0 ):create()
::qEdit := ::oEdit:qEdit
::qCurEditSplit := ::oEdit:qEdit
::qEdit := ::oEdit:qEdit
::qCqEdit := ::oEdit:qEdit
::qCoEdit := ::oEdit
::qDocument := QTextDocument():configure( ::qEdit:document() )
IF ::cType != "U"
@@ -802,7 +844,7 @@ METHOD IdeEditor:split( nOrient, oEditP )
METHOD IdeEditor:destroy()
LOCAL n, oEdit
::qCurEditSplit := NIL
::qCqEdit := NIL
::qEdit := NIL
DO WHILE len( ::aEdits ) > 0
oEdit := ::aEdits[ 1 ]
@@ -987,7 +1029,6 @@ CLASS IdeEdit INHERIT IdeObject
DATA qEdit
DATA qHLayout
DATA qLineNos
DATA qDocument
DATA nMode INIT 0
DATA nLineNo INIT -99
@@ -999,16 +1040,22 @@ CLASS IdeEdit INHERIT IdeObject
DATA qPoint INIT QPoint():new( 0,0 )
DATA qBrushCL INIT QBrush():new( "QColor", QColor():new( 240,240,240 ) )
DATA qBrushNR INIT QBrush():new( "QColor", QColor():new( 255,255,255 ) )
DATA qBrushMark INIT QBrush():new( "QColor", QColor():new( 0,255,255 ) )
DATA qActionTab
DATA qLastCursor
DATA qCursorMark
DATA aBookMarks INIT {}
METHOD new( oEditor, nMode )
METHOD create( oEditor, nMode )
METHOD destroy()
METHOD exeBlock( nMode, oEdit, o, p, p1 )
METHOD exeEvent( nMode, oEdit, o, p, p1 )
METHOD connectEditSlots( oEdit )
METHOD disConnectEditSlots( oEdit )
METHOD highlightCurrentLine( qEdit )
METHOD setNewMark()
METHOD gotoLastMark()
ENDCLASS
@@ -1063,12 +1110,10 @@ METHOD IdeEdit:create( oEditor, nMode )
::qActionTab := QAction():new( ::qEdit )
::qActionTab:setText( "Editor Tab" )
::qActionTab:setShortcut( QKeySequence():new( "Ctrl+F2" ) )
::connect( ::qActionTab, "triggered(bool)", {|| ::exeBlock( 71, Self ) } )
::connect( ::qActionTab, "triggered(bool)", {|| ::exeEvent( 71, Self ) } )
::connectEditSlots( Self )
::qDocument := QTextDocument():configure( ::qEdit:document() )
RETURN Self
/*----------------------------------------------------------------------*/
@@ -1111,21 +1156,21 @@ METHOD IdeEdit:disConnectEditSlots( oEdit )
METHOD IdeEdit:connectEditSlots( oEdit )
::Connect( oEdit:qEdit, "updateRequest(QRect,int)" , {|o,p,p1| ::exeBlock( 8, oEdit, o, p, p1 ) } )
::connect( oEdit:qEdit, "customContextMenuRequested(QPoint)", {|o,p | ::exeBlock( 1, oEdit, o, p ) } )
::Connect( oEdit:qEdit, "textChanged()" , {|o | ::exeBlock( 2, oEdit, o ) } )
::Connect( oEdit:qEdit, "copyAvailable(bool)" , {|o,p | ::exeBlock( 3, oEdit, o, p ) } )
::Connect( oEdit:qEdit, "modificationChanged(bool)" , {|o,p | ::exeBlock( 4, oEdit, o, p ) } )
::Connect( oEdit:qEdit, "redoAvailable(bool)" , {|o,p | ::exeBlock( 5, oEdit, o, p ) } )
::Connect( oEdit:qEdit, "selectionChanged()" , {|o,p | ::exeBlock( 6, oEdit, o, p ) } )
* ::Connect( oEdit:qEdit, "undoAvailable(bool)" , {|o,p | ::exeBlock( 7, oEdit, o, p ) } )
::Connect( oEdit:qEdit, "cursorPositionChanged()" , {|o | ::exeBlock( 9, oEdit, o ) } )
::Connect( oEdit:qEdit, "updateRequest(QRect,int)" , {|o,p,p1| ::exeEvent( 8, oEdit, o, p, p1 ) } )
::connect( oEdit:qEdit, "customContextMenuRequested(QPoint)", {|o,p | ::exeEvent( 1, oEdit, o, p ) } )
::Connect( oEdit:qEdit, "textChanged()" , {|o | ::exeEvent( 2, oEdit, o ) } )
::Connect( oEdit:qEdit, "copyAvailable(bool)" , {|o,p | ::exeEvent( 3, oEdit, o, p ) } )
::Connect( oEdit:qEdit, "modificationChanged(bool)" , {|o,p | ::exeEvent( 4, oEdit, o, p ) } )
::Connect( oEdit:qEdit, "redoAvailable(bool)" , {|o,p | ::exeEvent( 5, oEdit, o, p ) } )
::Connect( oEdit:qEdit, "selectionChanged()" , {|o,p | ::exeEvent( 6, oEdit, o, p ) } )
* ::Connect( oEdit:qEdit, "undoAvailable(bool)" , {|o,p | ::exeEvent( 7, oEdit, o, p ) } )
::Connect( oEdit:qEdit, "cursorPositionChanged()" , {|o | ::exeEvent( 9, oEdit, o ) } )
RETURN Self
/*----------------------------------------------------------------------*/
METHOD IdeEdit:exeBlock( nMode, oEdit, o, p, p1 )
METHOD IdeEdit:exeEvent( nMode, oEdit, o, p, p1 )
LOCAL pAct, qAct, n, pCursor, qCursor, qEdit, nLineNo, oo
HB_SYMBOL_UNUSED( o )
@@ -1169,8 +1214,10 @@ METHOD IdeEdit:exeBlock( nMode, oEdit, o, p, p1 )
hbide_dbg( "redoAvailable(bool)", p )
EXIT
CASE selectionChanged
::oEditor:qCurEditSplit := qEdit
hbide_dbg( "selectionChanged()" )
::oEditor:qCqEdit := qEdit
::oEditor:qCoEdit := oEdit
qCursor := QTextCursor():configure( qEdit:TextCursor() )
::oDK:setStatusText( SB_PNL_SELECTEDCHARS, len( qCursor:selectedText() ) )
EXIT
@@ -1191,7 +1238,7 @@ METHOD IdeEdit:exeBlock( nMode, oEdit, o, p, p1 )
EXIT
CASE cursorPositionChanged
::oEditor:dispEditInfo( qEdit )
::highlightCurrentLine( qEdit )
::highlightCurrentLine( oEdit )
EXIT
CASE 71
hbide_dbg( "CTRL+F2 Pressed" )
@@ -1202,39 +1249,85 @@ METHOD IdeEdit:exeBlock( nMode, oEdit, o, p, p1 )
/*----------------------------------------------------------------------*/
METHOD IdeEdit:highlightCurrentLine( qEdit )
LOCAL nCurLine, qCursor, lModified, qBlock
METHOD IdeEdit:highlightCurrentLine( oEdit )
LOCAL nCurLine, nLastLine, qCursor, lModified, qBlock, qDoc, qEdit, qBlockFmt, lClear, qB
qCursor := QTextCursor():configure( qEdit:TextCursor() )
nCurLine := qCursor:blockNumber()
IF !( nCurLine == ::nLastLine )
lModified := ::qDocument:isModified()
qEdit := oEdit:qEdit
qCursor := QTextCursor():configure( qEdit:textCursor() )
nCurLine := qCursor:blockNumber()
nLastLine := oEdit:nLastLine
IF !( nCurLine == nLastLine )
IF ( qBlock := QTextBlock():configure( qCursor:block() ) ):isValid()
IF QTextBlock():configure( ::qDocument:findBlockByNumber( ::nLastLine ) ):isValid()
::qBlockFormat:setBackground( ::qBrushNR )
::qLastCursor:setBlockFormat( ::qBlockFormat )
qDoc := QTextDocument():configure( qEdit:document() )
lModified := qDoc:isModified()
IF !empty( oEdit:qLastCursor )
IF ( qB := QTextBlock():configure( oEdit:qLastCursor:block() ) ):isValid()
IF qB:userState() != 77
oEdit:qLastCursor:setBlockFormat( QTextBlockFormat():new() )
ENDIF
ENDIF
ENDIF
::qBlockFormat:setBackground( ::qBrushNR )
::qBlockFormat := QTextBlockFormat():configure( qBlock:blockFormat() )
::qBlockFormat:setBackground( ::qBrushCL )
qCursor:setBlockFormat( ::qBlockFormat )
IF ( qB := QTextBlock():configure( qCursor:block() ) ):isValid()
IF qB:userState() != 77
qBlockFmt := QTextBlockFormat():configure( qBlock:blockFormat() )
qBlockFmt:setBackground( ::qBrushCL )
qCursor:setBlockFormat( qBlockFmt )
qEdit:setTextCursor( qCursor )
ENDIF
ENDIF
qDoc:setModified( lModified )
/* Infact these must not be called from here but because changing the format */
/* Qt consider that document has been modified, hence I need to put them here */
::qTabWidget:setTabIcon( ::qTabWidget:indexOf( oEdit:oEditor:oTab:oWidget ), ;
::resPath + iif( lModified, "tabmodified.png", "tabunmodified.png" ) )
::oDK:setStatusText( SB_PNL_MODIFIED, lModified )
ENDIF
::nLastLine := nCurLine
::qLastCursor := qCursor
oEdit:nLastLine := nCurLine
oEdit:qLastCursor := qCursor
ENDIF
lclear := 12
hbide_justACall( qB, lclear )
RETURN Self
::qDocument:setModified( lModified )
/*----------------------------------------------------------------------*/
/* Infact these must not be called from here but because changing the format */
/* Qt consider that document has been modified, hence I need to put them here */
METHOD IdeEdit:setNewMark()
LOCAL qBlockFmt, qTextBlock, qDoc, lModified
::qTabWidget:setTabIcon( ::qTabWidget:indexOf( ::oEditor:oTab:oWidget ), ;
::resPath + iif( lModified, "tabmodified.png", "tabunmodified.png" ) )
::oDK:setStatusText( SB_PNL_MODIFIED, lModified )
IF empty( ::qCursorMark )
qDoc := QTextDocument():configure( ::qEdit:document() )
lModified := qDoc:isModified()
::qCursorMark := QTextCursor():configure( ::qEdit:textCursor() )
qTextBlock := QTextBlock():configure( ::qCursorMark:block() )
qBlockFmt := QTextBlockFormat():new()
qBlockFmt:setBackground( ::qBrushMark )
::qCursorMark:setBlockFormat( qBlockFmt )
qTextBlock:setUserState( 77 )
qDoc:setModified( lModified )
ELSE
::qCursorMark:setBlockFormat( QTextBlockFormat():new() )
::qCursorMark:pPtr := 0
::qCursorMark := NIL
ENDIF
hbide_justACall( qTextBlock )
RETURN Self
/*----------------------------------------------------------------------*/
METHOD IdeEdit:gotoLastMark()
IF !empty( ::qCursorMark )
::qEdit:setTextCursor( ::qCursorMark )
ENDIF
RETURN Self

4
harbour/contrib/hbide/idesources.prg
View File

@@ -259,14 +259,14 @@ METHOD IdeSourcesManager:closeSource( nTab, lCanCancel, lCanceled )
lSave := .F.
ELSEIF lCanCancel
n := hbide_getYesNoCancel( oEditor:oTab:Caption, "Has been modified, save this source?", 'Save?' )
n := hbide_getYesNoCancel( oEditor:oTab:Caption, "has been modified, save this source?", 'Save?' )
IF ( lCanceled := ( n == QMessageBox_Cancel ) )
RETURN .F.
ENDIF
lSave := ( n == QMessageBox_Yes )
ELSE
lSave := hbide_getYesNo( oEditor:oTab:Caption, "Has been modified, save this source?", 'Save?' )
lSave := hbide_getYesNo( oEditor:oTab:Caption, "has been modified, save this source?", 'Save?' )
ENDIF

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

@@ -388,6 +388,7 @@ extern void * hbqt_pPtrFromObj( int iParam );
#define hbqt_par_HBQMainWindow( n ) ( ( HBQMainWindow * ) hbqt_gcpointer( n ) )
#define hbqt_par_HBQTableView( n ) ( ( HBQTableView * ) hbqt_gcpointer( n ) )
#define hbqt_par_HBQSyntaxHighlighter( n ) ( ( HBQSyntaxHighlighter * ) hbqt_gcpointer( n ) )
#define hbqt_par_HBQTextBlockUserData( n ) ( ( HBQTextBlockUserData * ) hbqt_gcpointer( n ) )
#define hbqt_par_HBSlots( n ) ( ( HBSlots * ) hbqt_gcpointer( n ) )
#define hbqt_par_QString( n ) ( ( QString ) hb_parcx( n ) )

106
harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.cpp
View File

@@ -63,37 +63,24 @@
#include <QHash>
#include <QTextCharFormat>
HBQTextBlockUserData::HBQTextBlockUserData()
: QTextBlockUserData()
{
state = -1;
}
HBQTextBlockUserData::~HBQTextBlockUserData()
{
}
void HBQTextBlockUserData::setData( int iState )
{
state = iState;
}
HBQSyntaxHighlighter::HBQSyntaxHighlighter( QTextDocument * parent )
: QSyntaxHighlighter( parent )
{
HighlightingRule rule;
#if 0
keywordFormat.setForeground( Qt::darkBlue );
keywordFormat.setFontWeight( QFont::Bold );
QStringList keywordPatterns;
keywordPatterns << "\\bchar\\b" << "\\bclass\\b" << "\\bconst\\b"
<< "\\bdouble\\b" << "\\benum\\b" << "\\bexplicit\\b"
<< "\\bfriend\\b" << "\\binline\\b" << "\\bint\\b"
<< "\\blong\\b" << "\\bnamespace\\b" << "\\boperator\\b"
<< "\\bprivate\\b" << "\\bprotected\\b" << "\\bpublic\\b"
<< "\\bshort\\b" << "\\bsignals\\b" << "\\bsigned\\b"
<< "\\bslots\\b" << "\\bstatic\\b" << "\\bstruct\\b"
<< "\\btemplate\\b" << "\\btypedef\\b" << "\\btypename\\b"
<< "\\bunion\\b" << "\\bunsigned\\b" << "\\bvirtual\\b"
<< "\\bvoid\\b" << "\\bvolatile\\b";
foreach( const QString &pattern, keywordPatterns )
{
rule.pattern = QRegExp( pattern );
rule.format = keywordFormat;
highlightingRules.append( rule );
}
#endif
classFormat.setFontWeight( QFont::Bold );
classFormat.setForeground( Qt::darkMagenta );
rule.pattern = QRegExp( "\\bQ[A-Za-z]+\\b" );
rule.format = classFormat;
highlightingRules.append( rule );
multiLineCommentFormat.setForeground( Qt::red );
commentStartExpression = QRegExp( "/\\*" );
@@ -143,22 +130,13 @@ void HBQSyntaxHighlighter::setHBMultiLineCommentFormat( const QTextCharFormat &
void HBQSyntaxHighlighter::highlightBlock( const QString &text )
{
//HB_TRACE( HB_TR_ALWAYS, ( "text = %s", ( char * ) &text ) );
#if 0
return ;
#endif
QRegExp expression;
#if 0
int index( 0 );
foreach( const HighlightingRule &rule, highlightingRules )
{
expression = QRegExp( rule.pattern );
index = expression.indexIn( text );
while( index >= 0 )
{
int length = expression.matchedLength();
setFormat( index, length, rule.format );
index = expression.indexIn( text, index + length );
}
}
#else
foreach( const hHighlightingRule &rule, hhighlightingRules )
{
QRegExp expression( rule.pattern );
@@ -170,8 +148,6 @@ void HBQSyntaxHighlighter::highlightBlock( const QString &text )
index = expression.indexIn( text, index + length );
}
}
#endif
setCurrentBlockState( 0 );
int startIndex = 0;
@@ -316,4 +292,48 @@ HB_FUNC( QT_HBQSYNTAXHIGHLIGHTER_SETHBFORMAT )
hbqt_par_HBQSyntaxHighlighter( 1 )->setHBFormat( hbqt_par_QString( 2 ), *hbqt_par_QTextCharFormat( 3 ) );
}
QT_G_FUNC( hbqt_gcRelease_HBQTextBlockUserData )
{
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
if( p && p->ph )
{
delete ( ( HBQTextBlockUserData * ) p->ph );
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "YES hbqt_gcRelease_HBQTextBlockUserData Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "DEL hbqt_gcRelease_HBQTextBlockUserData Object Already deleted!" ) );
}
}
void * hbqt_gcAllocate_HBQTextBlockUserData( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() );
p->ph = pObj;
p->func = hbqt_gcRelease_HBQTextBlockUserData;
HB_TRACE( HB_TR_DEBUG, ( " new_HBQTextBlockUserData %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
return p;
}
HB_FUNC( QT_HBQTEXTBLOCKUSERDATA )
{
void * pObj = NULL;
pObj = new HBQTextBlockUserData();
hb_retptrGC( hbqt_gcAllocate_HBQTextBlockUserData( pObj ) );
}
HB_FUNC( QT_HBQTEXTBLOCKUSERDATA_SETDATA )
{
hbqt_par_HBQTextBlockUserData( 1 )->setData( hb_parni( 2 ) );
}
#endif

13
harbour/contrib/hbqt/hbqt_hbqsyntaxhighlighter.h
View File

@@ -56,9 +56,22 @@
/*----------------------------------------------------------------------*/
#include <QSyntaxHighlighter>
#include <QTextBlockUserData>
class QTextDocument;
class HBQTextBlockUserData : public QTextBlockUserData
{
public:
HBQTextBlockUserData();
~HBQTextBlockUserData();
void setData( int state );
int state;
};
class HBQSyntaxHighlighter : public QSyntaxHighlighter
{
Q_OBJECT

2
harbour/contrib/hbqt/hbqt_hbslots.cpp
View File

@@ -664,7 +664,7 @@ static void hbqt_SlotsExecQRectInt( HBSlots * t_slots, QObject * object, const c
if( object )
{
int i = object->property( pszEvent ).toInt();
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
if( i > 0 && i <= t_slots->listBlock.size() && t_slots->listObj[ i - 1 ] == object && hb_vmRequestReenter() )
{
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
PHB_ITEM p1 = hb_itemPutPtr( NULL, new QRect( r ) );