From 0fa0b76a2e2c638a7ffd3ad08e20dbbfaa8d010a Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Tue, 7 Jun 2011 22:08:19 +0000 Subject: [PATCH] 2011-06-07 15:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/ideactions.prg * contrib/hbide/idemain.prg + Implemented: full list of codepages Harbour supports. Earlier the list included only unique CPs at the back. * contrib/hbide/idesaveload.prg * contrib/hbide/idechangelog.prg + Fixed: "Changelog User" was sharing a similar looking instance variable name. --- harbour/ChangeLog | 11 +++++++++++ harbour/contrib/hbide/ideactions.prg | 13 ++++++------- harbour/contrib/hbide/idechangelog.prg | 10 +++++----- harbour/contrib/hbide/idemain.prg | 4 ++-- harbour/contrib/hbide/idesaveload.prg | 6 +++--- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d296c0c765..9e9890b8fd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2011-06-07 15:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/ideactions.prg + * contrib/hbide/idemain.prg + + Implemented: full list of codepages Harbour supports. + Earlier the list included only unique CPs at the back. + + * contrib/hbide/idesaveload.prg + * contrib/hbide/idechangelog.prg + + Fixed: "Changelog User" was sharing a similar looking + instance variable name. + 2011-06-07 11:45 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/changelog.ui * contrib/hbide/idechangelog.prg diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index ab85a6cfa3..e05860a049 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -843,7 +843,7 @@ STATIC FUNCTION hbide_buildCDPMenu( oIde, oMenu ) oSubMenu := XbpMenu():new( oMenu, , .t. ):create() FOR EACH cdp IN get_list_of_real_codepages() - oSubMenu:addItem( { hbide_getCDPforID( cdp ) + ":" + hb_cdpUniID( cdp ), get_cdp_block( oIde, hb_cdpUniID( cdp ) ) } ) + oSubMenu:addItem( { cdp[ 1 ] + ":" + cdp[ 2 ], get_cdp_block( oIde, cdp[ 1 ] ) } ) NEXT RETURN oSubMenu @@ -857,9 +857,9 @@ STATIC FUNCTION get_list_of_real_codepages() STATIC s_uni IF empty( s_uni ) - s_uni := { => } + s_uni := {} FOR EACH cdp IN hb_cdpList() - s_uni[ hb_cdpUniID( cdp ) ] := cdp + aadd( s_uni, { cdp, hb_cdpUniID( cdp ) } ) NEXT ENDIF @@ -868,10 +868,9 @@ STATIC FUNCTION get_list_of_real_codepages() FUNCTION hbide_getCDPforID( cCodec ) LOCAL cdp - FOR EACH cdp IN hb_cdpList() - IF hb_cdpUniID( cdp ) == cCodec - cCodec := cdp - EXIT + FOR EACH cdp IN get_list_of_real_codepages() + IF cdp[ 1 ] == cCodec + RETURN cdp[ 2 ] ENDIF NEXT diff --git a/harbour/contrib/hbide/idechangelog.prg b/harbour/contrib/hbide/idechangelog.prg index 55fad450a4..d58b5019b6 100644 --- a/harbour/contrib/hbide/idechangelog.prg +++ b/harbour/contrib/hbide/idechangelog.prg @@ -168,8 +168,8 @@ METHOD IdeChangeLog:show() ::oUI:q_comboAction :addItem( "@ TODO : " ) ::oUI:q_comboAction :addItem( "| Moved : " ) - IF empty( ::oINI:cChangeLogUser ) - ::oINI:cChangeLogUser := hbide_fetchAString( ::oDlg:oWidget, ::oINI:cChangeLogUser, , "Developer Name" ) + IF empty( ::oINI:cUserChangeLog ) + ::oINI:cUserChangeLog := hbide_fetchAString( ::oDlg:oWidget, ::oINI:cUserChangeLog, , "Developer Name" ) ENDIF ::oUI:q_plainChangelog :setFont( ::oFont:oWidget ) @@ -178,7 +178,7 @@ METHOD IdeChangeLog:show() ::oUI:q_plainLogEntry :ensureCursorVisible() - ::oUI:q_editUser:setText( ::oINI:cChangeLogUser ) + ::oUI:q_editUser:setText( ::oINI:cUserChangeLog ) ::oUI:setWindowTitle( "Manage ChangeLog(s)" ) ::oEdit := IdeEdit():new( ::oIde ) @@ -263,7 +263,7 @@ METHOD IdeChangeLog:execEvent( cEvent, p ) IF ! empty( cTmp := ::buildLogEntry() ) cTmp1 := hb_memoread( ::oINI:cChangeLog ) ::nCntr := hbide_getLogCounter( cTmp1 ) - s := "$<" + strzero( ::nCntr, 6 ) + "> " + hbide_dtosFmt() + " " + left( time(), 5 ) + " " + ::oINI:cChangeLogUser + s := "$<" + strzero( ::nCntr, 6 ) + "> " + hbide_dtosFmt() + " " + left( time(), 5 ) + " " + ::oINI:cUserChangeLog IF ( n := at( "$<", cTmp1 ) ) > 0 //cTmp1 := substr( cTmp1, 1, n - 1 ) + s + hbide_eol() + cTmp + hbide_eol() + substr( cTmp1, n ) @@ -301,7 +301,7 @@ METHOD IdeChangeLog:execEvent( cEvent, p ) EXIT CASE "editUser_textChanged" IF !empty( p ) - ::oINI:cChangeLogUser := p + ::oINI:cUserChangeLog := p ENDIF EXIT CASE "editChangelog_textChanged" diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg index 243c8d514f..d03d5680a7 100644 --- a/harbour/contrib/hbide/idemain.prg +++ b/harbour/contrib/hbide/idemain.prg @@ -1598,10 +1598,10 @@ METHOD HbIde:setCodec( cCodec ) DEFAULT cCodec TO ::cWrkCodec IF ( n := at( ":", cCodec ) ) > 0 - cCodec := substr( cCodec, n+1 ) + cCodec := substr( cCodec, 1, n-1 ) ENDIF - ::cWrkCodec := hbide_getCDPforID( cCodec ) + ::cWrkCodec := cCodec ::oDK:setStatusText( SB_PNL_CODEC, ::cWrkCodec + ":" + hb_cdpUniID( ::cWrkCodec ) ) diff --git a/harbour/contrib/hbide/idesaveload.prg b/harbour/contrib/hbide/idesaveload.prg index 5c0217ee65..7780f1b1fd 100644 --- a/harbour/contrib/hbide/idesaveload.prg +++ b/harbour/contrib/hbide/idesaveload.prg @@ -170,7 +170,7 @@ CLASS IdeINI INHERIT IdeObject DATA nDocksRightTabPos INIT QTabWidget_South DATA cChangeLog INIT "" - DATA cChangeLogUser INIT "" + DATA cUserChangeLog INIT "" DATA lShowHideDocks INIT .t. @@ -403,7 +403,7 @@ METHOD IdeINI:save( cHbideIni ) aadd( txt_, "DocksRightTabPos" + "=" + hb_ntos( ::nDocksBottomTabPos ) ) aadd( txt_, "ShowHideDocks" + "=" + iif( ::lShowHideDocks , "YES", "NO" ) ) aadd( txt_, "ChangeLog" + "=" + ::cChangeLog ) - aadd( txt_, "ChangeLogUser" + "=" + ::cChangeLogUser ) + aadd( txt_, "UserChangeLog" + "=" + ::cUserChangeLog ) aadd( txt_, "" ) aadd( txt_, "[PROJECTS]" ) @@ -701,7 +701,7 @@ METHOD IdeINI:load( cHbideIni ) CASE "DocksRightTabPos" ; ::nDocksBottomTabPos := val( cVal ) ; EXIT CASE "ShowHideDocks" ; ::lShowHideDocks := !( cVal == "NO" ) ; EXIT CASE "ChangeLog" ; ::cChangeLog := cVal ; EXIT - CASE "ChangeLogUser" ; ::cChangeLogUser := cVal ; EXIT + CASE "UserChangeLog" ; ::cUserChangeLog := cVal ; EXIT ENDSWITCH ENDIF