diff --git a/harbour/contrib/hbide/hbide.rc b/harbour/contrib/hbide/hbide.rc new file mode 100644 index 0000000000..ba75734ef7 --- /dev/null +++ b/harbour/contrib/hbide/hbide.rc @@ -0,0 +1,2 @@ + +FRONTFACE ICON hbide.ico diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 496e65dd7c..f6cfd053df 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -421,7 +421,16 @@ METHOD IdeDocks:buildViewWidget( cObjectName ) oFrame:qLayout:setContentsMargins( 2, 2, 2, 2 ) oFrame:oTabWidget := XbpTabWidget():new():create( oFrame, , {0,0}, {200,200}, , .t. ) - + #if 0 + IF empty( qTBtn ) + qTBtn := QWidget():new() //QToolButton():new( oFrame:oTabWidget:oWidget ) + qTBtn:setTooltip( "Close Tab" ) + qTBtn:setIcon( hbide_image( "closetab" ) ) + qTBtn:setMaximumWidth( 16 ) + qTBtn:setMaximumHeight( 16 ) + ENDIF + oFrame:oTabWidget:oWidget:setCornerWidget( qTBtn, Qt_TopLeftCorner ) + #endif oFrame:oTabWidget:oWidget:setUsesScrollButtons( .f. ) oFrame:oTabWidget:oWidget:setMovable( .t. ) @@ -499,7 +508,7 @@ METHOD IdeDocks:buildToolBarPanels() ELSE qTBtn := QToolButton():new() qTBtn:setTooltip( a_[ 2 ] ) - qTBtn:setIcon( ::resPath + a_[ 1 ] + ".png" ) + qTBtn:setIcon( hbide_image( a_[ 1 ] ) ) qTBtn:setMaximumWidth( 20 ) qTBtn:setMaximumHeight( 20 ) IF a_[ 1 ] == "togglelinenumber" diff --git a/harbour/contrib/hbide/ideparseexpr.c b/harbour/contrib/hbide/ideparseexpr.c index 1a47e35d08..f8ddd336fd 100644 --- a/harbour/contrib/hbide/ideparseexpr.c +++ b/harbour/contrib/hbide/ideparseexpr.c @@ -91,9 +91,7 @@ static HB_ISIZ ide_linearfind( const char ** array, const char * pszText, HB_ISI if( hb_strnicmp( pszText, array[ i ], lentext + 1 ) == 0 ) return i + 1; } - } - return 0; } @@ -130,7 +128,6 @@ static HB_ISIZ ide_atbuff( const char * pszChars, const char * pszString, HB_ISI } } } - return 0; } @@ -279,7 +276,6 @@ HB_FUNC( PARSEXPR ) /* ( c, bHonorSpacing, bInRemark, bUpperKeyWord, bKeepCommen if( bInRemark ) { - if( bKeepComments ) { hb_strncat( szNextWord, pszExpr, sizeof( szNextWord ) - 1 ); diff --git a/harbour/contrib/hbide/idestylesheets.prg b/harbour/contrib/hbide/idestylesheets.prg index 64fa9dd6f1..21f2ade817 100644 --- a/harbour/contrib/hbide/idestylesheets.prg +++ b/harbour/contrib/hbide/idestylesheets.prg @@ -362,7 +362,7 @@ FUNCTION GetStyleSheet( cWidget, nMode ) aadd( txt_, ' stop: 0 #fafafa, stop: 0.4 #f4f4f4, ' ) aadd( txt_, ' stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); ' ) ELSE - aadd( txt_, ' background: white; ' ) + aadd( txt_, ' background: rgb( 230,230,230 ); ' ) ENDIF aadd( txt_, ' } ' ) aadd( txt_, ' QTabBar::tab:selected:hover { ' )