diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2e1318787c..b7eccb0040 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2011-06-06 18:13 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/idechangelog.prg + * Changed: behavior of "Current Log Entry" to scroll to last + after an element is added. + * contrib/hbide/ideactions.prg + * contrib/hbide/idemain.prg + * Changed: "Setup/CodePage" menu to display Harbour recognized + codepage name alsong its unique id. + + Let me know if that makes the whole list of Harbour's + code pages. + 2011-06-06 15:37 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idechangelog.prg * contrib/hbide/idesaveload.prg diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index f6e8365373..ab85a6cfa3 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( { hb_cdpUniID( cdp ), get_cdp_block( oIde, hb_cdpUniID( cdp ) ) } ) + oSubMenu:addItem( { hbide_getCDPforID( cdp ) + ":" + hb_cdpUniID( cdp ), get_cdp_block( oIde, hb_cdpUniID( cdp ) ) } ) NEXT RETURN oSubMenu @@ -852,12 +852,16 @@ STATIC FUNCTION get_cdp_block( oIde, cCodePage ) RETURN {|| oIde:setCodec( cCodePage ) } STATIC FUNCTION get_list_of_real_codepages() - LOCAL s_uni, cdp + LOCAL cdp - s_uni := { => } - FOR EACH cdp IN hb_cdpList() - s_uni[ hb_cdpUniID( cdp ) ] := cdp - NEXT + STATIC s_uni + + IF empty( s_uni ) + s_uni := { => } + FOR EACH cdp IN hb_cdpList() + s_uni[ hb_cdpUniID( cdp ) ] := cdp + NEXT + ENDIF RETURN s_uni diff --git a/harbour/contrib/hbide/idechangelog.prg b/harbour/contrib/hbide/idechangelog.prg index 2aa5c38466..94ec20528f 100644 --- a/harbour/contrib/hbide/idechangelog.prg +++ b/harbour/contrib/hbide/idechangelog.prg @@ -363,6 +363,7 @@ METHOD IdeChangeLog:addToLog( aLog ) ENDCASE ::oUI:q_plainLogEntry:setPlainText( hbide_arrayToMemo( a_ ) ) + QApplication():sendEvent( ::oUI:q_plainLogEntry, QKeyEvent( QEvent_KeyPress, Qt_Key_End, Qt_ControlModifier ) ) RETURN Self diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg index 7d0e7f10d6..243c8d514f 100644 --- a/harbour/contrib/hbide/idemain.prg +++ b/harbour/contrib/hbide/idemain.prg @@ -1593,9 +1593,14 @@ METHOD HbIde:updateTitleBar() /*----------------------------------------------------------------------*/ METHOD HbIde:setCodec( cCodec ) + LOCAL n DEFAULT cCodec TO ::cWrkCodec + IF ( n := at( ":", cCodec ) ) > 0 + cCodec := substr( cCodec, n+1 ) + ENDIF + ::cWrkCodec := hbide_getCDPforID( cCodec ) ::oDK:setStatusText( SB_PNL_CODEC, ::cWrkCodec + ":" + hb_cdpUniID( ::cWrkCodec ) )