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

2012-07-14 03:59 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/hbmk2_qt.hb
    - Reverted: a minor change in logic which produced regression at a 
        particular .ui.
     
  * contrib/hbide/idedocks.prg
  * contrib/hbide/ideedit.prg
  * contrib/hbide/ideeditor.prg
  * contrib/hbide/idesources.prg
  * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
    + Enhancements: 
        - tremendous speed improvements while editing and selecting.
        - fixed many small but important artifacts about column-selections.
        + added bookmark icon on the statusbar too. It makes it convinient 
          to manipulate them in speedy way.
    - Lost: number of characters selected. It has been a speed breaker.    
    - TODO: cleanup the hbqt_hbqplaintextedit.cpp source.
This commit is contained in:
Pritpal Bedi
2012-07-14 11:09:04 +00:00
parent ae32266829
commit 20823c504a
7 changed files with 189 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
harbour/ChangeLog
View File

@@ -16,6 +16,24 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-07-14 03:59 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/hbmk2_qt.hb
- Reverted: a minor change in logic which produced regression at a
particular .ui.
* contrib/hbide/idedocks.prg
* contrib/hbide/ideedit.prg
* contrib/hbide/ideeditor.prg
* contrib/hbide/idesources.prg
* contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
+ Enhancements:
- tremendous speed improvements while editing and selecting.
- fixed many small but important artifacts about column-selections.
+ added bookmark icon on the statusbar too. It makes it convinient
to manipulate them in speedy way.
- Lost: number of characters selected. It has been a speed breaker.
- TODO: cleanup the hbqt_hbqplaintextedit.cpp source.
2012-07-13 16:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtgui/qth/QClipboard.qth
* Fixed: constructor
@@ -32,7 +50,7 @@
fixes:
- some issues with QApplication:translation method
- it allows for binding QAction to a window for wchich the action
was deined, for example,
was defined, for example,
if SomeDialog.ui file has actions defined then virtual methods:
<actionName>_triggered is added to UI_SomeDialog class.

10
harbour/contrib/hbide/idedocks.prg
View File

@@ -1658,6 +1658,8 @@ METHOD IdeDocks:outputDoubleClicked( lSelected )
METHOD IdeDocks:buildStatusBar()
LOCAL i
STATIC qTBtn
::oIde:oSBar := XbpStatusBar():new()
::oSBar:create( ::oDlg, , { 0,0 }, { ::oDlg:currentSize()[ 1 ], 30 } )
::oSBar:oWidget:showMessage( "" )
@@ -1681,6 +1683,14 @@ METHOD IdeDocks:buildStatusBar()
::oSBar:addItem( "", , , , "Theme" ):oWidget:setMinimumWidth( 20 )
qTBtn := QToolButton( ::oSBar:oWidget )
qTBtn:setTooltip( "Toggle Mark" )
qTBtn:setIcon( QIcon( hbide_image( "bookmark" ) ) )
qTBtn:connect( "clicked()", {|| ::oEM:setMark() } )
qTBtn:setMaximumHeight( 16 )
qTBtn:setMaximumWidth( 16 )
qTBtn:setAutoRaise( .t. )
::oSBar:oWidget:addWidget( qTBtn )
FOR i := 1 TO 6
::oSBar:oWidget:addWidget( ::getMarkWidget( i ) )
NEXT

64
harbour/contrib/hbide/ideedit.prg
View File

@@ -349,7 +349,8 @@ METHOD IdeEdit:destroy()
::disconnectEditSignals()
::qEdit := NIL
//::qEdit := NIL
::qEdit:setParent( QWidget() ) /* Works, but GPF on exit */
::qFont := NIL
RETURN NIL
@@ -395,7 +396,7 @@ METHOD IdeEdit:connectEditSignals()
/*----------------------------------------------------------------------*/
METHOD IdeEdit:execEvent( nMode, p, p1 )
LOCAL qAct, n, qCursor, cAct
LOCAL qAct, n, qCursor, cAct, lOtherEdit
HB_SYMBOL_UNUSED( p1 )
@@ -422,32 +423,26 @@ METHOD IdeEdit:execEvent( nMode, p, p1 )
EXIT
CASE selectionChanged
::oEditor:qCqEdit := ::qEdit
::oEditor:qCoEdit := Self
lOtherEdit := ! ( ::oEditor:qCqEdit == ::qEdit )
IF lOtherEdit
::oEditor:qCqEdit := ::qEdit
::oEditor:qCoEdit := Self
/* Book Marks reach-out buttons */
::relayMarkButtons()
::updateTitleBar()
::toggleCurrentLineHighlightMode()
::toggleLineNumbers()
::toggleHorzRuler()
::dispStatusInfo()
::unHighlight()
IF HB_ISOBJECT( ::oEditor:qHiliter )
::oEditor:qHiliter:hbSetEditor( ::qEdit )
::qEdit:hbSetHighlighter( ::oEditor:qHiliter )
ENDIF
ENDIF
#if 0 /* Disabled for now, has a big speed disadvantage */
::qEdit:hbGetSelectionInfo()
IF ::aSelectionInfo[ 1 ] > -1 .AND. ::aSelectionInfo[ 1 ] == ::aSelectionInfo[ 3 ]
::oDK:setStatusText( SB_PNL_SELECTEDCHARS, Len( ::getSelectedText() ) )
ELSE
::oDK:setStatusText( SB_PNL_SELECTEDCHARS, 0 )
ENDIF
::oUpDn:show()
::unHighlight()
IF HB_ISOBJECT( ::oEditor:qHiliter )
::oEditor:qHiliter:hbSetEditor( ::qEdit )
::qEdit:hbSetHighlighter( ::oEditor:qHiliter )
::qEdit:hbHighlightPage()
ENDIF
#endif
EXIT
CASE copyAvailable
@@ -659,6 +654,7 @@ METHOD IdeEdit:execKeyEvent( nMode, nEvent, p, p1 )
ELSEIF p == 21000 /* Sends Block Info { t,l,b,r,mode,state } hbGetBlockInfo() */
::aSelectionInfo := p1
::oDK:setButtonState( "SelectionMode", ::aSelectionInfo[ 5 ] > 1 )
ELSEIF p == 21001
::handlePreviousWord( .t. )
@@ -755,7 +751,7 @@ METHOD IdeEdit:dispStatusInfo()
::qEdit:hbGetSelectionInfo()
nMode := ::aSelectionInfo[ 5 ]
::oDK:setButtonState( "stream", nMode > 1 )
::oDK:setButtonState( "SelectionMode", nMode > 1 )
::oDK:setStatusText( SB_PNL_STREAM, iif( nMode == 2, "Column", iif( nMode == 3, "Line", "Stream" ) ) )
RETURN Self
@@ -1044,7 +1040,7 @@ METHOD IdeEdit:insertBlockContents( aCord )
/*----------------------------------------------------------------------*/
METHOD IdeEdit:deleteBlockContents( aCord )
LOCAL nT, nL, nB, nR, nW, i, cLine, qCursor, k, nSelMode
LOCAL nT, nL, nB, nR, i, cLine, qCursor, k, nSelMode
IF ::lReadOnly
RETURN Self
@@ -1062,8 +1058,7 @@ METHOD IdeEdit:deleteBlockContents( aCord )
qCursor := ::qEdit:textCursor()
qCursor:beginEditBlock()
nW := nR - nL
IF nW == 0 .AND. k == Qt_Key_Backspace
IF k == Qt_Key_Backspace
IF nSelMode == selectionMode_column
FOR i := nT TO nB
cLine := ::getLine( i + 1 )
@@ -1584,15 +1579,6 @@ METHOD IdeEdit:setReadOnly( lReadOnly )
/*----------------------------------------------------------------------*/
METHOD IdeEdit:gotoMark( nIndex )
IF Len( ::aBookMarks ) >= nIndex
::qEdit:hbGotoBookmark( ::aBookMarks[ nIndex ] )
::qEdit:centerCursor()
ENDIF
RETURN Self
/*----------------------------------------------------------------------*/
METHOD IdeEdit:relayMarkButtons()
LOCAL oBtn
FOR EACH oBtn IN ::aMarkTBtns
@@ -1605,6 +1591,17 @@ METHOD IdeEdit:relayMarkButtons()
/*----------------------------------------------------------------------*/
METHOD IdeEdit:gotoMark( nIndex )
IF Len( ::aBookMarks ) >= nIndex
::qEdit:hbGotoBookmark( ::aBookMarks[ nIndex ] )
::qEdit:centerCursor()
ENDIF
RETURN Self
/*----------------------------------------------------------------------*/
METHOD IdeEdit:setNewMark()
LOCAL qCursor, nBlock, n
@@ -1624,6 +1621,7 @@ METHOD IdeEdit:setNewMark()
ENDIF
::qEdit:hbBookMarks( nBlock )
::qEdit:repaint()
ENDIF
RETURN Self

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

@@ -1718,13 +1718,13 @@ METHOD IdeEditor:activateTab( mp1, mp2, oXbp )
IF !empty( oEdit := ::oEM:getEditorByTabObject( oXbp ) )
oEdit:setDocumentProperties()
oEdit:qCoEdit:relayMarkButtons()
oEdit:qCoEdit:updateTitleBar()
oEdit:qCoEdit:toggleLineNumbers()
oEdit:qCoEdit:toggleHorzRuler()
oEdit:qCoEdit:toggleCurrentLineHighlightMode()
oEdit:qCoEdit:dispStatusInfo()
::oUpDn:show()
oEdit:changeThumbnail()
oEdit:qCoEdit:highlightPage()
ENDIF
RETURN Self

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

@@ -268,6 +268,7 @@ METHOD IdeSourcesManager:saveSource( nTab, lCancel, lAs )
oEdit:sourceFile := cFileToSave
oEdit:oTab:Caption := cFile + cExt
oEdit:updateTitleBar()
::qTabWidget:setTabText( nIndex, cFile + cExt )
::qTabWidget:setTabTooltip( nIndex, cFileToSave )

8
harbour/contrib/hbqt/hbmk2_qt.hb
View File

@@ -626,18 +626,12 @@ STATIC FUNCTION hbqtui_gen_prg( cFile, cFuncName )
ENDIF
NEXT
FOR EACH s IN aLines
IF ! Empty( s )
hbqtui_replaceConstants( @s ) /* Replace Qt::* with Harbour constants */
ENDIF
NEXT
FOR EACH s IN aLines
IF ! Empty( s )
/* Replace Qt::* with actual values */
// hbqtui_replaceConstants( @s )
hbqtui_replaceConstants( @s )
IF "setupUi" $ s
lCreateFinished := .T.

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

@@ -130,7 +130,7 @@ HBQPlainTextEdit::HBQPlainTextEdit( QWidget * parent ) : QPlainTextEdit( parent
isCompletionTipsActive = true;
isInDrag = false;
dragStartPosition = QPoint();
#if 0
QTextFrameFormat format( this->document()->rootFrame()->frameFormat() );
format.setMargin( 0 );
@@ -186,7 +186,7 @@ HBQPlainTextEdit::HBQPlainTextEdit( QWidget * parent ) : QPlainTextEdit( parent
highlighter = NULL;
block = NULL;
setAcceptDrops( true );
}
@@ -198,10 +198,10 @@ HBQPlainTextEdit::~HBQPlainTextEdit()
if( timer )
timer->stop();
#endif
delete lineNumberArea;
delete horzRuler;
if( block )
hb_itemRelease( block );
}
@@ -425,7 +425,6 @@ void HBQPlainTextEdit::hbSelectAll()
columnEnds = 0;
emit selectionChanged();
repaint();
}
/*----------------------------------------------------------------------*/
@@ -485,24 +484,32 @@ void HBQPlainTextEdit::hbSetSelectionInfo( PHB_ITEM selectionInfo )
rowEnds = hb_arrayGetNI( selectionInfo, 3 );
columnEnds = hb_arrayGetNI( selectionInfo, 4 );
selectionMode = hb_arrayGetNI( selectionInfo, 5 );
#if 0
PHB_ITEM pSome = hb_arrayGetItemPtr( selectionInfo, 6 );
if( hb_itemType( pSome ) & HB_IT_LOGICAL ){
if( hb_itemGetL( pSome ) ){
//if( hb_itemType( pSome ) & HB_IT_LOGICAL )
{
if( hb_itemGetL( pSome ) )
{
QTextCursor c( textCursor() );
c.clearSelection();
}
}
pSome = hb_arrayGetItemPtr( selectionInfo, 7 );
if( hb_itemType( pSome ) & HB_IT_LOGICAL ){
if( hb_itemGetL( pSome ) ){
//if( hb_itemType( pSome ) & HB_IT_LOGICAL )
{
if( hb_itemGetL( pSome ) )
{
emit selectionChanged();
}
}
else {
#if 0
else
{
emit selectionChanged();
}
repaint();
#endif
#endif
emit selectionChanged();
}
/*----------------------------------------------------------------------*/
@@ -542,7 +549,7 @@ void HBQPlainTextEdit::hbSetSelectionMode( int mode, bool byApplication )
isColumnSelectionON = false;
isLineSelectionON = false;
hbClearSelection();
repaint();
// repaint();
return;
}
@@ -654,7 +661,7 @@ void HBQPlainTextEdit::hbSetSelectionMode( int mode, bool byApplication )
}
}
emit selectionChanged();
repaint();
repaint(); /* Only once when mode is changed from stream to column , so no issues */
}
/*----------------------------------------------------------------------*/
@@ -732,9 +739,10 @@ void HBQPlainTextEdit::hbCut( int k )
hb_vmEvalBlockV( block, 2, p1, p2 );
hb_itemRelease( p1 );
hb_itemRelease( p2 );
#if 0
if( selectionMode == selectionMode_column ) //&& k == 0 )
columnEnds = columnBegins;
#endif
}
else
{
@@ -800,45 +808,62 @@ void HBQPlainTextEdit::dropEvent( QDropEvent *event )
if( event->dropAction() == Qt::CopyAction || event->dropAction() == Qt::MoveAction )
{
if( event->source() == this )
{
{
QPoint p( event->pos() );
event->ignore();
QTextCursor c = cursorForPosition( p );
int row = c.blockNumber();
int col = c.columnNumber();
if( row >= rowBegins && row <= rowEnds )
if( ( selectionMode == selectionMode_stream || selectionMode == selectionMode_line ) && row >= rowBegins && row <= rowEnds )
{
setTextCursor( c );
}
else if( selectionMode == selectionMode_column && row >= rowBegins && row <= rowEnds && col >= columnBegins && col <= columnEnds )
{
/* Do not clear selection
selectionState = 0;
hbClearSelection();
*/
setTextCursor( c );
}
else
{
{
hbCopy();
if( event->dropAction() != Qt::CopyAction )
{
int rBgn = rowBegins;
int rEnd = rowEnds;
int cBgn = columnBegins;
int cEnd = columnEnds;
int linesBefore = blockCount();
hbCut( Qt::Key_Delete );
int linesAfter = blockCount();
QTextCursor cc( textCursor() );
cc.movePosition( QTextCursor::Start );
if( rBgn > row )
if( row == rBgn ) /* Only in case of column selection */
{
cc.movePosition( QTextCursor::Down, QTextCursor::MoveAnchor, row );
if( col > cEnd )
{
cc.movePosition( QTextCursor::Right, QTextCursor::MoveAnchor, col - ( cEnd - cBgn ) );
}
else if( col < cBgn )
{
cc.movePosition( QTextCursor::Right, QTextCursor::MoveAnchor, col );
}
}
else if( row > rEnd )
else
{
cc.movePosition( QTextCursor::Down, QTextCursor::MoveAnchor, row - ( linesBefore - linesAfter ) );
if( rBgn > row )
{
cc.movePosition( QTextCursor::Down, QTextCursor::MoveAnchor, row );
}
else if( row > rEnd )
{
cc.movePosition( QTextCursor::Down, QTextCursor::MoveAnchor, row - ( linesBefore - linesAfter ) );
}
cc.movePosition( QTextCursor::Right, QTextCursor::MoveAnchor, col );
}
cc.movePosition( QTextCursor::Right, QTextCursor::MoveAnchor, col );
setTextCursor( cc );
}
else
@@ -849,12 +874,12 @@ void HBQPlainTextEdit::dropEvent( QDropEvent *event )
hbClearSelection();
hbPaste();
emit selectionChanged();
}
}
/* It is a hack. Without this editing caret is lost ??? */
QMimeData * data = new QMimeData();
QDropEvent * ev = new QDropEvent( p, Qt::CopyAction, data, 0, 0 );
QPlainTextEdit::dropEvent( ev );
return;
}
}
@@ -865,18 +890,18 @@ void HBQPlainTextEdit::dropEvent( QDropEvent *event )
void HBQPlainTextEdit::dragMoveEvent( QDragMoveEvent *event )
{
if( event->mimeData()->hasText() )
if( event->mimeData()->hasText() )
{
if( event->source() == this )
if( event->source() == this )
{
event->accept();
}
else
}
else
{
event->acceptProposedAction();
}
}
else
}
else
{
event->ignore();
}
@@ -887,18 +912,18 @@ void HBQPlainTextEdit::dragMoveEvent( QDragMoveEvent *event )
void HBQPlainTextEdit::dragEnterEvent( QDragEnterEvent *event )
{
if( event->mimeData()->hasText() )
if( event->mimeData()->hasText() )
{
if( event->source() == this )
if( event->source() == this )
{
event->accept();
}
else
}
else
{
event->acceptProposedAction();
}
}
else
}
else
{
event->ignore();
}
@@ -922,7 +947,7 @@ void HBQPlainTextEdit::mouseDoubleClickEvent( QMouseEvent *event )
c.clearSelection();
setTextCursor( c );
emit selectionChanged();
repaint();
hbGetSelectionInfo(); /* Wrong name : should been hbPostSelectionInfo */
}
if( block )
@@ -966,23 +991,28 @@ void HBQPlainTextEdit::mousePressEvent( QMouseEvent *event )
setCursorWidth( 1 );
selectionMode = selectionMode_stream;
emit selectionChanged();
repaint();
hbGetSelectionInfo();
// repaint(); /* Not required as per QPlainTextEdit::mousePressEvent( event ); */
}
else
{
if( event->buttons() & Qt::LeftButton )
{
setCursorWidth( 1 );
QTextCursor c( cursorForPosition( event->pos() ) );
int row = c.blockNumber();
if( row >= rowBegins && row <= rowEnds )
int col = c.columnNumber();
if( ( selectionMode == selectionMode_stream || selectionMode == selectionMode_line ) && row >= rowBegins && row <= rowEnds )
{
dragStartPosition = event->pos();
}
else if( selectionMode == selectionMode_column && row >= rowBegins && row <= rowEnds && col >= columnBegins && col <= columnEnds )
{
dragStartPosition = event->pos();
}
else
{
{
if( ! isSelectionPersistent )
{
selectionState = 0;
@@ -1041,8 +1071,10 @@ void HBQPlainTextEdit::mouseMoveEvent( QMouseEvent *event )
}
if( selectionMode == selectionMode_line )
{
selectionMode = selectionMode_stream;
hbGetSelectionInfo();
}
if( event->buttons() & Qt::LeftButton )
{
if( ( event->pos() - dragStartPosition ).manhattanLength() < QApplication::startDragDistance() )
@@ -1052,26 +1084,26 @@ void HBQPlainTextEdit::mouseMoveEvent( QMouseEvent *event )
if( row >= rowBegins && row <= rowEnds )
{
event->ignore();
QDrag * qDrag = new QDrag( this );
QMimeData * qMimeData = new QMimeData();
hbCopy();
qMimeData->setText( QApplication::clipboard()->text() );
qDrag->setMimeData( qMimeData );
QPixmap pmap = QPixmap::grabWidget( this->viewport(), hbGetSelectionRect() );
pmap.setMask( pmap.createMaskFromColor( m_selectionColor, Qt::MaskInColor ) );
pmap.setMask( pmap.createMaskFromColor( palette().color( QPalette::Base ), Qt::MaskInColor ) );
pmap.setMask( pmap.createMaskFromColor( m_currentLineColor, Qt::MaskInColor ) );
qDrag->setPixmap( pmap );
qDrag->setHotSpot( QPoint( 5,5 ) );
qDrag->exec( Qt::MoveAction | Qt::CopyAction );
delete qDrag;
return;
}
}
if( selectionState == 1 )
{
selectionState = 2;
@@ -1111,7 +1143,7 @@ void HBQPlainTextEdit::mouseMoveEvent( QMouseEvent *event )
}
c.clearSelection();
setTextCursor( c );
repaint();
// repaint(); /* NOT REQUIRED : QPlainTextEdit::mouseMoveEvent( event ); */
}
}
}
@@ -1137,7 +1169,7 @@ void HBQPlainTextEdit::keyReleaseEvent( QKeyEvent * event )
bool HBQPlainTextEdit::hbKeyPressSelectionByApplication( QKeyEvent * event )
{
bool shift = event->modifiers() & Qt::ShiftModifier;
int k = event->key();
int k = event->key();
if( isNavableKey( k ) && shift )
{
@@ -1217,7 +1249,8 @@ bool HBQPlainTextEdit::hbKeyPressSelectionByApplication( QKeyEvent * event )
QTextCursor c( textCursor() );
rowEnds = c.blockNumber();
}
repaint();
// repaint();
// update();
}
else
{
@@ -1230,28 +1263,29 @@ bool HBQPlainTextEdit::hbKeyPressSelectionByApplication( QKeyEvent * event )
bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
{
int k = event->key();
int k;
bool ctrl, shift;
if( isSelectionByApplication ) {
return hbKeyPressSelectionByApplication( event );
}
k = event->key();
ctrl = event->modifiers() & Qt::ControlModifier;
shift = event->modifiers() & Qt::ShiftModifier;
bool ctrl = event->modifiers() & Qt::ControlModifier;
bool shift = event->modifiers() & Qt::ShiftModifier;
if( ctrl && shift && ! isNavableKey( k ) ) {
return false;
}
if( ctrl && event->text().isEmpty() && ! isNavableKey( k ) ) {
return false;
}
if( ctrl && ( k == Qt::Key_C || k == Qt::Key_V || k == Qt::Key_X ||
k == Qt::Key_A || k == Qt::Key_Z || k == Qt::Key_Y ) ) {
event->ignore();
return true;
}
if( isSelectionByApplication ) {
return hbKeyPressSelectionByApplication( event );
}
bool bClear = false;
if( shift && isNavableKey( k ) )
@@ -1260,14 +1294,15 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
{
selectionMode = selectionMode_stream;
selectionState = 0;
hbGetSelectionInfo();
}
if( selectionState == 0 )
{
hbClearSelection();
}
isShiftPressed = true;
event->accept();
QTextCursor c( textCursor() );
c.clearSelection();
@@ -1276,15 +1311,15 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
if( columnBegins == -1 )
{
if( selectionMode == selectionMode_column )
{
setCursorWidth( 0 );
}
selectionState = 2;
rowBegins = c.blockNumber();
columnBegins = c.columnNumber();
rowEnds = rowBegins;
columnEnds = columnBegins;
emit selectionChanged();
repaint();
}
QKeyEvent * ev = new QKeyEvent( event->type(), event->key(), ctrl ? Qt::ControlModifier : Qt::NoModifier, event->text() );
@@ -1366,7 +1401,7 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
}
}
emit selectionChanged();
repaint();
repaint(); /* A Must Here , otherwise selection will not be reflected */
return true;
}
else if( ! ctrl && k >= ' ' && k < 127 && columnBegins >= 0 && selectionMode == selectionMode_column )
@@ -1378,7 +1413,7 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
PHB_ITEM p1 = hb_itemPutNI( NULL, 21013 );
PHB_ITEM p2 = hb_itemNew( NULL );
PHB_ITEM pObj = hbqt_bindGetHbObject( NULL, ( void * ) event, "HB_QKEYEVENT", NULL, 0 ) ;
hb_arrayNew( p2, 7 );
hb_arraySetNI( p2, 1, rowBegins );
hb_arraySetNI( p2, 2, columnBegins );
@@ -1402,16 +1437,20 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
}
}
else
{
bClear = true;
}
}
else if( ! ctrl && ( k == Qt::Key_Backspace || k == Qt::Key_Delete ) && columnBegins >= 0 && selectionState > 0 && selectionMode == selectionMode_column )
{
hbCut( k );
if( k == Qt::Key_Backspace ){
if( k == Qt::Key_Backspace )
{
columnBegins--;
columnEnds--;
}
else {
else
{
columnEnds = columnBegins;
}
repaint();
@@ -1432,7 +1471,7 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
{
hbCut( Qt::Key_Delete );
hbClearSelection();
repaint();
// repaint();
selectionState = 0;
}
else if( isNavableKey( k ) || ( k >= ' ' && k < 127 ) )
@@ -1449,7 +1488,8 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
emit selectionChanged();
setCursorWidth( 1 );
selectionState = 0;
if( columnEnds == columnBegins ){
if( columnEnds == columnBegins )
{
hbClearSelection();
}
}
@@ -1476,7 +1516,7 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
QPlainTextEdit::keyPressEvent( event );
QTextCursor c( textCursor() );
rowEnds = c.blockNumber();
repaint();
r//epaint();
return true;
}
else if( ! isSelectionPersistent )
@@ -1487,7 +1527,7 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
setCursorWidth( 1 );
selectionState = 0;
hbClearSelection();
repaint();
// repaint();
}
}
}
@@ -1500,7 +1540,7 @@ void HBQPlainTextEdit::keyPressEvent( QKeyEvent * event )
{
if( c && c->popup()->isVisible() )
{
// The following keys are forwarded by the completer to the widget
/* The following keys are forwarded by the completer to the widget */
switch( event->key() )
{
case Qt::Key_Enter :
@@ -1516,7 +1556,6 @@ void HBQPlainTextEdit::keyPressEvent( QKeyEvent * event )
PHB_ITEM p1 = hb_itemPutNI( NULL, 21001 );
hb_vmEvalBlockV( block, 1, p1 );
hb_itemRelease( p1 );
hbRefreshCompleter();
}
break;
@@ -1533,9 +1572,11 @@ void HBQPlainTextEdit::keyPressEvent( QKeyEvent * event )
}
}
if( hbKeyPressSelection( event ) ){
if( hbKeyPressSelection( event ) )
{
return;
}
QPlainTextEdit::keyPressEvent( event );
if( ! isCodeCompletionActive ){
@@ -1905,7 +1946,7 @@ void HBQPlainTextEdit::hbPaintHighlight( QPaintEvent * event )
QRect HBQPlainTextEdit::hbGetSelectionRect()
{
QRect r = QRect();
if( rowBegins >= 0 && rowEnds >= 0 )
{
int rb = rowBegins <= rowEnds ? rowBegins : rowEnds;
@@ -1924,7 +1965,7 @@ QRect HBQPlainTextEdit::hbGetSelectionRect()
int top = ( ( rb <= t ) ? 0 : ( ( rb - t ) * fontHeight ) ) + ttop;
int btm = ( ( re - t + 1 ) * fontHeight ) - top + ttop;
btm = btm > viewport()->height() ? viewport()->height() : btm;
if( selectionMode == selectionMode_column )
{
int cb = columnBegins <= columnEnds ? columnBegins : columnEnds;
@@ -2118,8 +2159,8 @@ void HBQPlainTextEdit::hbBookmarks( int block )
}
hbUpdateLineNumberAreaWidth( 0 );
lineNumberArea->repaint();
update();
// lineNumberArea->repaint();
// update();
}
/*----------------------------------------------------------------------*/