" + "" + substr( cProto, 1, n - 1 ) + "" + ;
diff --git a/harbour/contrib/hbide/ideeditor.prg b/harbour/contrib/hbide/ideeditor.prg
index d0fbfb4644..d996070ef6 100644
--- a/harbour/contrib/hbide/ideeditor.prg
+++ b/harbour/contrib/hbide/ideeditor.prg
@@ -82,6 +82,7 @@ CLASS IdeEditsManager INHERIT IdeObject
DATA qContextMenu
DATA qContextSub
DATA aActions INIT {}
+ DATA aProtos INIT {}
METHOD new( oIde )
METHOD create( oIde )
@@ -169,6 +170,7 @@ CLASS IdeEditsManager INHERIT IdeObject
METHOD qscintilla()
METHOD setStyleSheet( nMode )
METHOD updateCompleter()
+ METHOD getProto( cWord )
ENDCLASS
@@ -236,45 +238,50 @@ METHOD IdeEditsManager:create( oIde )
/*----------------------------------------------------------------------*/
METHOD IdeEditsManager:updateCompleter()
- LOCAL aFun := ::oFN:getFunctionPrototypes()
- LOCAL aHrb := ::oHL:getFunctionPrototypes()
- LOCAL n, s, a_, k_:={}
+ LOCAL aFun, aHrb, n, s, k_
+
+ /* Collection of prototypes can be extended to honor plugins and defined in "setup" */
+
+ aFun := ::oFN:getFunctionPrototypes()
+ aHrb := ::oHL:getFunctionPrototypes()
::disconnect( ::qCompleter, "activated(QString)", {|p| ::execEvent( "qcompleter_activated", p ) } )
- FOR EACH a_ IN { aFun, aHrb }
- FOR EACH s IN a_
- s := trim( s )
- IF ::oINI:lCompletionWithArgs
- IF ascan( k_, s ) == 0
+ ::aProtos := {}
+ aeval( aHrb, {|e| aadd( ::aProtos, e ) } )
+ aeval( aFun, {|e| aadd( ::aProtos, e ) } )
+
+ k_:= {}
+ FOR EACH s IN ::aProtos
+ s := alltrim( s )
+ IF ::oINI:lCompletionWithArgs
+ IF ascan( k_, s ) == 0
+ aadd( k_, s )
+ ENDIF
+ ELSE
+ IF ( n := at( "(", s ) ) == 0
+ IF ( n := at( " ", s ) ) > 0
+ aadd( k_, substr( s, 1, n - 1 ) )
+ ELSE
aadd( k_, s )
ENDIF
ELSE
- IF ( n := at( "(", s ) ) == 0
- IF ( n := at( " ", s ) ) > 0
- aadd( k_, substr( s, 1, n - 1 ) )
- ELSE
- aadd( k_, trim( s ) )
- ENDIF
- ELSE
- aadd( k_, substr( s, 1, n - 1 ) )
- ENDIF
+ aadd( k_, trim( substr( s, 1, n - 1 ) ) )
ENDIF
- NEXT
+ ENDIF
NEXT
-
asort( k_, , , {|e,f| lower( e ) < lower( f ) } )
::qProtoList:clear()
aeval( k_, {|e| ::qProtoList:append( e ) } )
+ ::qCompleter:setWrapAround( .t. )
+ ::qCompleter:setCaseSensitivity( Qt_CaseInsensitive )
+ ::qCompleter:setModelSorting( QCompleter_CaseInsensitivelySortedModel )
::qCompModel:setStringList( ::qProtoList )
::qCompleter:setModel( ::qCompModel )
- ::qCompleter:setModelSorting( QCompleter_CaseInsensitivelySortedModel )
- ::qCompleter:setCaseSensitivity( Qt_CaseInsensitive )
::qCompleter:setCompletionMode( QCompleter_PopupCompletion )
- ::qCompleter:setWrapAround( .t. )
QListView():from( ::qCompleter:popup() ):setAlternatingRowColors( .t. )
@@ -284,6 +291,21 @@ METHOD IdeEditsManager:updateCompleter()
/*----------------------------------------------------------------------*/
+METHOD IdeEditsManager:getProto( cWord )
+ LOCAL n, nLen
+
+ cWord := upper( cWord )
+ nLen := len( cWord )
+
+ /* This can be rationalized */
+ IF ( n := ascan( ::aProtos, {|e| upper( left( e, nLen ) ) == cWord } ) ) > 0
+ RETURN ::aProtos[ n ]
+ ENDIF
+
+ RETURN ""
+
+/*----------------------------------------------------------------------*/
+
METHOD IdeEditsManager:destroy()
LOCAL a_
diff --git a/harbour/contrib/hbide/idefunctions.prg b/harbour/contrib/hbide/idefunctions.prg
index 08496df6d9..fa1d0b4ad9 100644
--- a/harbour/contrib/hbide/idefunctions.prg
+++ b/harbour/contrib/hbide/idefunctions.prg
@@ -82,17 +82,6 @@
/*----------------------------------------------------------------------*/
-#define editFunc_returnPressed 101
-#define editFunc_textChanged 102
-#define tableFuncList_itemSelectionChanged 103
-#define tableFuncList_itemDoubleClicked 104
-#define buttonMark_clicked 105
-#define buttonLoad_clicked 106
-#define buttonTag_clicked 107
-#define buttonClose_clicked 108
-
-/*----------------------------------------------------------------------*/
-
CLASS IdeFunctions INHERIT IdeObject
DATA isNotSetYet INIT .t.
@@ -146,16 +135,16 @@ METHOD IdeFunctions:create( oIde )
::buildHeader()
- ::oUI:signal( "editFunction" , "textChanged(QString)" , {|p| ::execEvent( editFunc_textChanged, p ) } )
- ::oUI:signal( "editFunction" , "returnPressed()" , {| | ::execEvent( editFunc_returnPressed ) } )
+ ::oUI:signal( "editFunction" , "textChanged(QString)" , {|p| ::execEvent( "editFunc_textChanged", p ) } )
+ ::oUI:signal( "editFunction" , "returnPressed()" , {| | ::execEvent( "editFunc_returnPressed" ) } )
//
- ::oUI:signal( "buttonMark" , "clicked()" , {| | ::execEvent( buttonMark_clicked ) } )
- ::oUI:signal( "buttonLoad" , "clicked()" , {| | ::execEvent( buttonLoad_clicked ) } )
- ::oUI:signal( "buttonTag" , "clicked()" , {| | ::execEvent( buttonTag_clicked ) } )
- ::oUI:signal( "buttonClose" , "clicked()" , {| | ::execEvent( buttonClose_clicked ) } )
+ ::oUI:signal( "buttonMark" , "clicked()" , {| | ::execEvent( "buttonMark_clicked" ) } )
+ ::oUI:signal( "buttonLoad" , "clicked()" , {| | ::execEvent( "buttonLoad_clicked" ) } )
+ ::oUI:signal( "buttonTag" , "clicked()" , {| | ::execEvent( "buttonTag_clicked" ) } )
+ ::oUI:signal( "buttonClose" , "clicked()" , {| | ::execEvent( "buttonClose_clicked" ) } )
//
- ::oUI:signal( "tableFuncList", "itemSelectionChanged()" , {| | ::execEvent( tableFuncList_itemSelectionChanged ) } )
- ::oUI:signal( "tableFuncList", "itemDoubleClicked(QTblWItem)", {|p| ::execEvent( tableFuncList_itemDoubleClicked, p ) } )
+ ::oUI:signal( "tableFuncList", "itemSelectionChanged()" , {| | ::execEvent( "tableFuncList_itemSelectionChanged" ) } )
+ ::oUI:signal( "tableFuncList", "itemDoubleClicked(QTblWItem)", {|p| ::execEvent( "tableFuncList_itemDoubleClicked", p ) } )
RETURN Self
@@ -165,35 +154,36 @@ METHOD IdeFunctions:execEvent( nMode, p )
LOCAL n, nLen
DO CASE
- CASE nMode == editFunc_textChanged
+ CASE nMode == "editFunc_textChanged"
p := upper( p )
nLen := len( p )
IF ( n := ascan( ::aList, {|e_| left( e_[ 1 ], nLen ) == p } ) ) > 0
::oUI:q_tableFuncList:setCurrentItem( ::aItems[ n ] )
ENDIF
- CASE nMode == editFunc_returnPressed
+ CASE nMode == "editFunc_returnPressed"
::openFunction( .f. )
- CASE nMode == tableFuncList_itemDoubleClicked
+ CASE nMode == "tableFuncList_itemDoubleClicked"
::openFunction( .f. )
- CASE nMode == buttonMark_clicked
+ CASE nMode == "buttonMark_clicked"
::oUI:q_listProjects:show()
::listProjects()
- CASE nMode == buttonLoad_clicked
+ CASE nMode == "buttonLoad_clicked"
::oUI:q_listProjects:hide()
::loadTags()
- CASE nMode == buttonTag_clicked
+ CASE nMode == "buttonTag_clicked"
::oUI:q_listProjects:hide()
::buildTags()
+ ::oEM:updateCompleter()
- CASE nMode == buttonClose_clicked
+ CASE nMode == "buttonClose_clicked"
::oFunctionsDock:hide()
- CASE nMode == tableFuncList_itemSelectionChanged
+ CASE nMode == "tableFuncList_itemSelectionChanged"
n := ::oUI:q_tableFuncList:currentRow()
IF n >= 0
::oUI:q_editSyntax:setText( ::aList[ n + 1, 2 ] )
@@ -617,8 +607,6 @@ METHOD IdeFunctions:populateTable()
::oUI:q_labelEntries:setText( "Entries: " + hb_ntos( n ) )
NEXT
- ::oEM:updateCompleter()
-
RETURN Self
/*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg
index 8f206c2f79..fe8a111215 100644
--- a/harbour/contrib/hbide/ideharbourhelp.prg
+++ b/harbour/contrib/hbide/ideharbourhelp.prg
@@ -222,8 +222,6 @@ METHOD IdeHarbourHelp:show()
::populateRootInfo()
::refreshDocTree()
-
- ::oEM:updateCompleter()
ENDIF
RETURN Self
@@ -499,6 +497,8 @@ METHOD IdeHarbourHelp:execEvent( nMode, p, p1 )
CASE "buttonRefresh_clicked"
::refreshDocTree()
+ ::aProtoTypes := {}
+ ::lLoadedProto := .f.
::oEM:updateCompleter()
EXIT
diff --git a/harbour/contrib/hbqt/doc/en/class_hbqplaintextedit.txt b/harbour/contrib/hbqt/doc/en/class_hbqplaintextedit.txt
index 8145062a7e..5a00ad4b56 100644
--- a/harbour/contrib/hbqt/doc/en/class_hbqplaintextedit.txt
+++ b/harbour/contrib/hbqt/doc/en/class_hbqplaintextedit.txt
@@ -78,6 +78,7 @@
:hbHighlightArea( nTop, nLeft, nBottom, nRight, nMode ) -> NIL
:hbTogglePersistentSelection() -> NIL
:hbHorzRulerVisible( lVisible ) -> NIL
+ :hbSetProtoStyle( cCss ) -> NIL
$DESCRIPTION$
diff --git a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
index bb0b1b523b..cadad25386 100644
--- a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
+++ b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.cpp
@@ -145,6 +145,17 @@ HBQPlainTextEdit::HBQPlainTextEdit( QWidget * parent ) : QPlainTextEdit( parent
setContentsMargins( 0,0,0,0 );
+ ttFrame = new QFrame( this );
+ ttFrame->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
+ ttLayout = new QHBoxLayout( ttFrame );
+ ttFrame->setLayout( ttLayout );
+ ttLabel = new QLabel();
+ ttLabel->setText( "" );
+ hbSetProtoStyle();
+ ttLayout->addWidget( ttLabel );
+ ttFrame->setFocusPolicy( Qt::NoFocus );
+ ttFrame->hide();
+
#if 0
timer = new QTimer( this );
connect( timer, SIGNAL( timeout() ), this, SLOT( hbUpdateCaret() ) );
@@ -203,18 +214,35 @@ void HBQPlainTextEdit::hbRefresh()
/*----------------------------------------------------------------------*/
+void HBQPlainTextEdit::hbSetProtoStyle( const QString & css )
+{
+ if( css == ( QString ) "" )
+ ttLabel->setStyleSheet( "background-color: rgb(255,255,174); border: 1px solid black; padding: 3px;" );
+ else
+ ttLabel->setStyleSheet( css );
+}
+
+/*----------------------------------------------------------------------*/
+
void HBQPlainTextEdit::hbShowPrototype( const QString & tip )
{
+ ttLabel->setText( tip );
+
if( tip == ( QString ) "" )
{
- QToolTip::hideText();
isTipActive = false;
+ ttFrame->hide();
}
else
{
- QRect r = HBQPlainTextEdit::cursorRect();
- QToolTip::showText( mapToGlobal( QPoint( r.x(), r.y()+20 ) ), tip );
isTipActive = true;
+ QRect r = HBQPlainTextEdit::cursorRect();
+ ttFrame->setMaximumWidth( viewport()->width() );
+ int w = ttLabel->width();
+ int x = r.x()-r.width();
+ x = x + w > viewport()->width() ? viewport()->width() - w : x;
+ ttFrame->move( x, r.y() + 7 );
+ ttFrame->show();
}
}
@@ -1255,13 +1283,6 @@ bool HBQPlainTextEdit::hbKeyPressSelection( QKeyEvent * event )
void HBQPlainTextEdit::keyPressEvent( QKeyEvent * event )
{
-//HB_TRACE( HB_TR_ALWAYS, ( "keyPressEvent %i 000", event->key() ) );
- if( hbKeyPressSelection( event ) )
- {
-// QApplication::processEvents();
- return;
- }
-//HB_TRACE( HB_TR_ALWAYS, ( "keyPressEvent %i", event->key() ) );
if( c && c->popup()->isVisible() )
{
// The following keys are forwarded by the completer to the widget
@@ -1281,16 +1302,33 @@ void HBQPlainTextEdit::keyPressEvent( QKeyEvent * event )
hb_itemRelease( p1 );
}
break;
+ case Qt::Key_ParenLeft:
+ if( block ){
+ PHB_ITEM p1 = hb_itemPutNI( NULL, 21002 );
+ hb_vmEvalBlockV( block, 1, p1 );
+ hb_itemRelease( p1 );
+ }
+ break;
default:
break;
}
}
+ if( hbKeyPressSelection( event ) )
+ {
+ return;
+ }
QPlainTextEdit::keyPressEvent( event );
if( ! c )
return;
+ if( isTipActive )
+ {
+ c->popup()->hide();
+ return;
+ }
+
if( ( event->modifiers() & ( Qt::ControlModifier | Qt::AltModifier ) ) )
{
c->popup()->hide();
@@ -1321,6 +1359,8 @@ void HBQPlainTextEdit::keyPressEvent( QKeyEvent * event )
}
QRect cr = cursorRect();
+ c->popup()->setMaximumWidth( viewport()->width() );
+
cr.setWidth( c->popup()->sizeHintForColumn( 0 ) + c->popup()->verticalScrollBar()->sizeHint().width() );
cr.setTop( cr.top() + horzRulerHeight + 5 );
cr.setBottom( cr.bottom() + horzRulerHeight + 5 );
@@ -1917,6 +1957,14 @@ void HBQPlainTextEdit::hbUpdateHorzRuler( const QRect & rect, int dy )
if( dy == 0 )
horzRuler->update();
+
+ if( dy != 0 )
+ {
+ if( isTipActive )
+ {
+ ttFrame->move( ttFrame->x(), ttFrame->y() + dy );
+ }
+ }
}
/*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.h b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.h
index ce11d3eda5..428777e88a 100644
--- a/harbour/contrib/hbqt/hbqt_hbqplaintextedit.h
+++ b/harbour/contrib/hbqt/hbqt_hbqplaintextedit.h
@@ -67,6 +67,8 @@
#include