diff --git a/harbour/ChangeLog b/harbour/ChangeLog index dff2cc7f48..3a500cd929 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-05-20 07:14 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbide/ideprojmanager.prg + * contrib/hbide/idesources.prg + % Modified: to present the project location folder to + select sources in the "Project Properties" dialog. + 2010-05-20 06:56 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + contrib/hbide/qscintilla + contrib/hbide/qscintilla/qt diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg index a70bc7471e..803a055639 100644 --- a/harbour/contrib/hbide/ideprojmanager.prg +++ b/harbour/contrib/hbide/ideprojmanager.prg @@ -910,7 +910,7 @@ METHOD IdeProjManager:addSources() LOCAL aFiles, a_, b_, s IF ::isValidProjectLocation( .t. ) - IF !empty( aFiles := ::oSM:selectSource( "openmany" ) ) + IF !empty( aFiles := ::oSM:selectSource( "openmany", , , ::oUI:q_editPrjLoctn:text() ) ) a_:= hbide_memoToArray( ::oUI:q_editSources:toPlainText() ) b_:={} diff --git a/harbour/contrib/hbide/idesources.prg b/harbour/contrib/hbide/idesources.prg index f297b9a773..f8eec51aba 100644 --- a/harbour/contrib/hbide/idesources.prg +++ b/harbour/contrib/hbide/idesources.prg @@ -86,7 +86,7 @@ CLASS IdeSourcesManager INHERIT IdeObject METHOD saveAndExit() METHOD revertSource( nTab ) METHOD openSource() - METHOD selectSource( cMode, cFile, cTitle ) + METHOD selectSource( cMode, cFile, cTitle, cDftPath ) ENDCLASS @@ -456,9 +456,11 @@ METHOD IdeSourcesManager:openSource() /*----------------------------------------------------------------------*/ -METHOD IdeSourcesManager:selectSource( cMode, cFile, cTitle ) +METHOD IdeSourcesManager:selectSource( cMode, cFile, cTitle, cDftPath ) LOCAL oDlg, cPath + DEFAULT cDftPath TO ::cLastFileOpenPath + oDlg := XbpFileDialog():new():create( ::oDlg, , { 10,10 } ) IF cMode == "open" @@ -466,7 +468,7 @@ METHOD IdeSourcesManager:selectSource( cMode, cFile, cTitle ) oDlg:center := .t. oDlg:fileFilters := { { "All Files" , "*.*" }, { "PRG Sources", "*.prg" }, { "C Sources" , "*.c" },; { "CPP Sources", "*.cpp" }, { "H Headers" , "*.h" }, { "CH Headers", "*.ch" } } - cFile := oDlg:open( ::cLastFileOpenPath, , .f. ) + cFile := oDlg:open( cDftPath, , .f. ) IF !empty( cFile ) ::oIde:cLastFileOpenPath := cFile ENDIF @@ -477,7 +479,7 @@ METHOD IdeSourcesManager:selectSource( cMode, cFile, cTitle ) oDlg:defExtension:= 'prg' oDlg:fileFilters := { { "All Files" , "*.*" }, { "PRG Sources", "*.prg" }, { "C Sources" , "*.c" },; { "CPP Sources", "*.cpp" }, { "H Headers" , "*.h" }, { "CH Headers", "*.ch" } } - cFile := oDlg:open( ::cLastFileOpenPath, , .t. ) + cFile := oDlg:open( cDftPath, , .t. ) IF !empty( cFile ) .AND. !empty( cFile[ 1 ] ) ::oIde:cLastFileOpenPath := cFile[ 1 ] ENDIF