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

2011-03-31 12:55 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbide/ideharbourhelp.prg
    ! Fixed: a regression.

  * contrib/hbqt/hbmk2_qt.hbs
    ! Formatting.

  * contrib/hbqt/qtgui/hbqt_hbqgraphicsscene.cpp
    ! Formatting.

  * contrib/hbqt/tests/demoqt.prg
    ! QComboBox() demo code updated to insert items alphabetically.
This commit is contained in:
Pritpal Bedi
2011-03-31 19:59:20 +00:00
parent fbd71e39eb
commit ed1f17048b
5 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -16,6 +16,19 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-03-31 12:55 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/ideharbourhelp.prg
! Fixed: a regression.
* contrib/hbqt/hbmk2_qt.hbs
! Formatting.
* contrib/hbqt/qtgui/hbqt_hbqgraphicsscene.cpp
! Formatting.
* contrib/hbqt/tests/demoqt.prg
! QComboBox() demo code updated to insert items alphabetically.
2011-03-31 10:03 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/hbqreportsmanager.prg
* contrib/hbide/idedocks.prg

5
harbour/contrib/hbide/ideharbourhelp.prg
View File

@@ -365,7 +365,8 @@ METHOD IdeHarbourHelp:clear()
FOR EACH a_ IN ::aCategory
IF a_[ 7 ] == " "
// a_[ 6 ]:removeChild( a_[ 5 ] )
a_[ 6 ] := NIL ; a_[ 5 ] := NIL
a_[ 5 ] := NIL
a_[ 6 ] := NIL
ENDIF
NEXT
FOR EACH a_ IN ::aCategory
@@ -373,7 +374,7 @@ METHOD IdeHarbourHelp:clear()
a_[ 5 ] := NIL
ENDIF
NEXT
::aCategory := NIL
::aCategory := {}
::oUI:q_treeDoc:clear()
::oUI:q_treeCategory:clear()

18
harbour/contrib/hbqt/hbmk2_qt.hbs
View File

@@ -1373,11 +1373,11 @@ METHOD HbQtSource:build()
aadd( aLine, "" )
n := ascan( ::cls_, {|e_| left( lower( e_[ 1 ] ), 7 ) == "inherit" .and. !empty( e_[ 2 ] ) } )
if n > 0
IF n > 0
s := upper( strtran( ::cls_[ n, 2 ], "Q", "HB_Q" ) )
else
ELSE
s := "HBQTOBJECTHANDLER"
endif
ENDIF
FOR EACH k IN hb_aTokens( s, "," )
aadd( aLine, "HB_FUNC_EXTERN( " + upper( alltrim( k ) ) + " );" )
NEXT
@@ -1406,11 +1406,11 @@ METHOD HbQtSource:build()
aadd( aLine, "#include <QtCore/QPointer>" )
n := aScan( ::code_, {|e| "gcMark" $ e } )
IF !empty( ::code_ )
if n == 0
aeval( ::code_, {| e | aadd( aLine, StrTran( e, chr( 13 ) ) ) } )
else
IF n == 0
aeval( ::code_, {| e | aadd( aLine, StrTran( e, chr( 13 ) ) ) } )
ELSE
aeval( ::code_, {| e | aadd( aLine, StrTran( e, chr( 13 ) ) ) }, 1, n-1 )
endif
ENDIF
aadd( aLine, "" )
ENDIF
@@ -1432,9 +1432,9 @@ METHOD HbQtSource:build()
aadd( aLine, "} HBQT_GC_T_" + ::cQtObject + ";" )
aadd( aLine, " " )
aadd( aLine, " " )
if( n > 0 )
IF n > 0
aeval( ::code_, {| e | aadd( aLine, StrTran( e, chr( 13 ) ) ) }, n )
endif
ENDIF
aadd( aLine, " " )
aadd( aLine, " " )

8
harbour/contrib/hbqt/qtgui/hbqt_hbqgraphicsscene.cpp
View File

@@ -496,10 +496,10 @@ void HBQGraphicsScene::dropEvent( QGraphicsSceneDragDropEvent * event )
//
}
}
hb_itemRelease( p1 );
hb_itemRelease( p2 );
hb_itemRelease( p3 );
}
hb_itemRelease( p1 );
hb_itemRelease( p2 );
hb_itemRelease( p3 );
}
else
{
PHB_ITEM p1 = hb_itemPutNI( NULL, ( int ) QEvent::GraphicsSceneDrop );

3
harbour/contrib/hbqt/tests/demoqt.prg
View File

@@ -459,9 +459,10 @@ STATIC FUNCTION Build_Controls( oWnd )
oEdit:show()
oComboBox := QComboBox( oWnd )
oComboBox:setInsertPolicy( QComboBox_InsertAlphabetically )
oComboBox:addItem( "Third" )
oComboBox:addItem( "First" )
oComboBox:addItem( "Second" )
oComboBox:addItem( "Third" )
oComboBox:connect( "currentIndexChanged(int)", {|i| i := i, MsgInfo( oComboBox:itemText( i ) ) } )
oComboBox:move( 5, 60 )
oComboBox:resize( 345, 30 )