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

2012-08-20 20:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbide/dict.prg
    + Added: line number to the Book-Mark button's tooltip.

  * contrib/hbide/edit.prg
  * contrib/hbide/saveload.prg
    + Advanced: the user-interface elements needed to implement 
       User-Dictionaries, still a work-in-progress.
This commit is contained in:
Pritpal Bedi
2012-08-21 03:03:09 +00:00
parent 36e0df723d
commit c5e2bba504
4 changed files with 107 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -16,6 +16,15 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-08-20 20:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/dict.prg
+ Added: line number to the Book-Mark button's tooltip.
* contrib/hbide/edit.prg
* contrib/hbide/saveload.prg
+ Advanced: the user-interface elements needed to implement
User-Dictionaries, still a work-in-progress.
2012-08-20 17:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/docks.prg
* contrib/hbide/edit.prg

87
harbour/contrib/hbide/dict.prg
View File

@@ -73,19 +73,24 @@
/*----------------------------------------------------------------------*/
#define DIC_FILENAME 1
#define DIC_CASESENSTITIVE 2
#define DIC_CONVMODE 3
#define DIC_AUTOCOMPLETE 4
#define DIC_BGCOLOR 5
#define DIC_ACTIVE 2
#define DIC_APPLYTO 3
#define DIC_CONVMODE 4
#define DIC_CASESENSTITIVE 5
#define DIC_BOLD 6
#define DIC_ITALIC 7
#define DIC_UNDERLINE 8
#define DIC_TXTCOLOR 9
#define DIC_BGCOLOR 10
#define DIC_NUM_VRBLS 5
#define DIC_NUM_VRBLS 10
/*----------------------------------------------------------------------*/
FUNCTION hbide_loadUserDictionaries( oIde )
// File , CaseSensitive , ConvMode=asis, upper, lower , include in autocomplete, bgColor
// File , Active, Applyto, ConvMode=asis upper lower, CaseSensitive, bold, italic, uline, txtcolor, bgColor
#if 1
LOCAL aDict := { "E:\harbour\contrib\hbide\projects\my.dic;NO;ASIS;YES;{122,133,233}" }
LOCAL aDict := { "E:\harbour\contrib\hbide\projects\my.dic;YES;PRG.C.CPP;ASIS;NO;NO;NO;NO;{0,0,0};{122,133,233}" }
#else
LOCAL aDict := {}
#endif
@@ -107,6 +112,7 @@ CLASS IdeDictionary INHERIT IdeObject
DATA cDictInfo INIT ""
DATA cFilename INIT ""
DATA lActive INIT .T.
DATA cApplyTo INIT ""
DATA lToPrg INIT .T.
DATA lToC INIT .F.
DATA lToCPP INIT .F.
@@ -120,13 +126,12 @@ CLASS IdeDictionary INHERIT IdeObject
DATA lBold INIT .F.
DATA lItalic INIT .F.
DATA lULine INIT .F.
DATA lTxtColor INIT .F.
DATA lBgBColor INIT .F.
DATA cTxtColor INIT ""
DATA cBgColor INIT ""
DATA qBGColor
DATA lAutoComplete INIT .T.
DATA qTxtColor
DATA qBgColor
DATA aItems INIT {}
METHOD new( oIde )
@@ -134,6 +139,7 @@ CLASS IdeDictionary INHERIT IdeObject
METHOD destroy() VIRTUAL
METHOD load( cDict )
METHOD toString()
METHOD populateUI( oUI )
ENDCLASS
@@ -160,19 +166,36 @@ METHOD IdeDictionary:load( cDict )
asize( a_, DIC_NUM_VRBLS )
DEFAULT a_[ DIC_FILENAME ] TO ""
DEFAULT a_[ DIC_CASESENSTITIVE ] TO "NO"
DEFAULT a_[ DIC_ACTIVE ] TO "YES"
DEFAULT a_[ DIC_APPLYTO ] TO ".PRG.C.CPP"
DEFAULT a_[ DIC_CONVMODE ] TO "ASIS"
DEFAULT a_[ DIC_AUTOCOMPLETE ] TO "YES"
DEFAULT a_[ DIC_BGCOLOR ] TO "NONE"
DEFAULT a_[ DIC_CASESENSTITIVE ] TO "NO"
DEFAULT a_[ DIC_BOLD ] TO "NO"
DEFAULT a_[ DIC_ITALIC ] TO "NO"
DEFAULT a_[ DIC_UNDERLINE ] TO "NO"
DEFAULT a_[ DIC_TXTCOLOR ] TO ""
DEFAULT a_[ DIC_BGCOLOR ] TO ""
::cDictInfo := cDict
::cFilename := a_[ 1 ]
::lCaseSensitive := a_[ 2 ] == "YES"
::cConvMode := a_[ 3 ]
::lAutoComplete := iif( a_[ 4 ] == "NO", .f., .t. )
::cBgColor := a_[ 5 ]
::cFilename := a_[ DIC_FILENAME ]
::lActive := a_[ DIC_ACTIVE ] == "YES"
::cApplyTo := a_[ DIC_APPLYTO ]
::cConvMode := a_[ DIC_CONVMODE ]
::lCaseSensitive := a_[ DIC_CASESENSTITIVE ] == "YES"
::lBold := a_[ DIC_BOLD ] == "YES"
::lItalic := a_[ DIC_ITALIC ] == "YES"
::lULine := a_[ DIC_UNDERLINE ] == "YES"
::cTxtColor := a_[ DIC_TXTCOLOR ]
::cBgColor := a_[ DIC_BGCOLOR ]
IF !( ::cBgColor == "NONE" )
IF ! Empty( ::cTxtColor )
c_:= hbide_evalAsIs( ::cBgColor )
IF HB_ISARRAY( c_ ) .AND. Len( c_ ) == 3
::qTxtColor := QColor( c_[ 1 ], c_[ 2 ], c_[ 3 ] )
ENDIF
ENDIF
IF ! Empty( ::cBgColor )
c_:= hbide_evalAsIs( ::cBgColor )
IF HB_ISARRAY( c_ ) .AND. Len( c_ ) == 3
::qBgColor := QColor( c_[ 1 ], c_[ 2 ], c_[ 3 ] )
@@ -218,3 +241,27 @@ METHOD IdeDictionary:toString()
RETURN cDict
/*----------------------------------------------------------------------*/
METHOD IdeDictionary:populateUI( oUI )
oUI:checkDictToPrg : setChecked( ".PRG" $ ::cApplyTo )
oUI:checkDictToC : setChecked( ".C" $ ::cApplyTo )
oUI:checkDictToCpp : setChecked( ".CPP" $ ::cApplyTo )
oUI:checkDictToCh : setChecked( ".CH" $ ::cApplyTo )
oUI:checkDictToh : setChecked( ".H" $ ::cApplyTo )
oUI:checkDictToIni : setChecked( ".INI" $ ::cApplyTo )
oUI:checkDictToTxt : setChecked( ".TXT" $ ::cApplyTo )
oUI:checkDictToHbp : setChecked( ".HBP" $ ::cApplyTo )
oUI:checkDictActive : setChecked( ::lActive )
oUI:checkDictCaseSens : setChecked( ::lCaseSensitive )
oUI:checkDictBold : setChecked( ::lBold )
oUI:checkDictItalic : setChecked( ::lItalic )
oUI:checkDictULine : setChecked( ::lULine )
oUI:checkDictColorText : setChecked( ! Empty( ::cTxtColor ) )
oUI:checkDictColorBack : setChecked( ! Empty( ::cBgColor ) )
RETURN NIL
/*----------------------------------------------------------------------*/

4
harbour/contrib/hbide/edit.prg
View File

@@ -652,7 +652,7 @@ METHOD IdeEdit:execKeyEvent( nMode, nEvent, p, p1, p2 )
CASE 1001 /* Fired from hbqt_hbqplaintextedit.cpp */
SWITCH p
CASE QEvent_MouseButtonDblClick
::lCopyWhenDblClicked := .t.
// ::lCopyWhenDblClicked := .t.
::clickFuncHelp()
EXIT
CASE QEvent_MouseButtonPress
@@ -1663,7 +1663,7 @@ METHOD IdeEdit:setTooltipMark( nIndex )
IF Len( ::aBookMarks ) >= nIndex
oBlock := ::qEdit:document():findBlockByNumber( ::aBookMarks[ nIndex ] - 1 )
IF oBlock:isValid()
::aMarkTBtns[ nIndex ]:setTooltip( oBlock:text() )
::aMarkTBtns[ nIndex ]:setTooltip( hb_ntos( ::aBookMarks[ nIndex ] ) + " : " + oBlock:text() )
ENDIF
ENDIF

30
harbour/contrib/hbide/saveload.prg
View File

@@ -128,6 +128,7 @@
#define __buttonEditorSave_clicked__ 2049
#define __buttonEditorClose_clicked__ 2050
#define __tableVar_keyPress__ 2051
#define __listDictNames_currentRowChanged__ 2052
/*----------------------------------------------------------------------*/
//
@@ -1252,6 +1253,7 @@ CLASS IdeSetup INHERIT IdeObject
METHOD pushThemesData()
METHOD getThemeData( nTheme )
METHOD viewIt( cFileName, lSaveAs, lSave, lReadOnly, lApplyHiliter )
METHOD uiDictionaries()
ENDCLASS
@@ -1473,7 +1475,9 @@ METHOD IdeSetup:connectSlots()
::oUI:buttonVSSExe :connect( "clicked()" , {| | ::execEvent( __buttonVSSExe_clicked__ ) } )
::oUI:buttonVSSDatabase :connect( "clicked()" , {| | ::execEvent( __buttonVSSDatabase_clicked__ ) } )
::oUI:tableVar :connect( "itemActivated(QTableWidgetItem*)", {|p| ::execEvent( __tableVar_keyPress__, p ) } )
::oUI:tableVar :connect( "itemActivated(QTableWidgetItem*)", {|p| ::execEvent( __tableVar_keyPress__, p ) } )
::oUI:listDictNames :connect( "currentRowChanged(int)" , {|i| ::execEvent( __listDictNames_currentRowChanged__ , i ) } )
RETURN Self
@@ -1762,6 +1766,7 @@ METHOD IdeSetup:show()
::setIcons()
::connectSlots()
::oUI:stackedWidget:setCurrentIndex( 8 )
::oUI:stackedWidget:setCurrentIndex( 0 )
::oUI:hide()
ENDIF
@@ -1841,6 +1846,9 @@ METHOD IdeSetup:execEvent( nEvent, p, p1 )
qItem := ::oUI:treeWidget:currentItem()
IF ( nIndex := ascan( ::aTree, qItem:text( 0 ) ) ) > 0
::oUI:stackedWidget:setCurrentIndex( nIndex - 1 )
IF nIndex == 7 /* Dictionaries */
::uiDictionaries()
ENDIF
ENDIF
EXIT
@@ -2141,12 +2149,32 @@ METHOD IdeSetup:execEvent( nEvent, p, p1 )
::oINI:cToolbarSize := ::oUI:comboTBSize:currentText()
::oDK:setToolbarSize( val( ::oINI:cToolbarSize ) )
EXIT
CASE __listDictNames_currentRowChanged__
IF p >= 0 .AND. p < Len( ::oIde:aUserDict )
::oIde:aUserDict[ p + 1 ]:populateUI( ::oUI )
ENDIF
EXIT
ENDSWITCH
RETURN Self
/*----------------------------------------------------------------------*/
METHOD IdeSetup:uiDictionaries()
LOCAL oDict
::oUI:listDictNames:clear()
::oUI:listDictNames:setCurrentRow( -1 )
FOR EACH oDict IN ::oIde:aUserDict
::oUI:listDictNames:addItem( oDict:cFilename )
NEXT
RETURN NIL
/*----------------------------------------------------------------------*/
METHOD IdeSetup:viewIt( cFileName, lSaveAs, lSave, lReadOnly, lApplyHiliter )
LOCAL oUI