From 675cbdbc4f23a70063d111eec46e71348f97c577 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 6 Jun 2011 09:29:24 +0000 Subject: [PATCH] 2011-06-06 14:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/ideactions.prg ! Fixed: "CodePage" submenu in "Setup" went hidden for some time. --- harbour/ChangeLog | 4 + harbour/contrib/hbide/ideactions.prg | 181 ++++++++++++++------------- 2 files changed, 95 insertions(+), 90 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0fec276b27..4dde7a1672 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2011-06-06 14:26 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/ideactions.prg + ! Fixed: "CodePage" submenu in "Setup" went hidden for some time. + 2011-06-05 20:10 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/hbqt_hbqsyntaxhighlighter.cpp * contrib/hbide/idechangelog.prg diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index 873fdc1551..f6e8365373 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -633,8 +633,8 @@ METHOD IdeActions:buildMainMenu() hbide_menuAddSep( oSubMenu ) oSubMenu2 := hbide_buildCDPMenu( oIde, oSubMenu ) //hbide_buildCodecMenu( oIde, oSubMenu ) - oSubMenu2:title := "~CodePage" - oSubMenu:addItem( { oSubMenu2, NIL } ) +// oSubMenu2:title := "~CodePage" + oSubMenu:addItem( { oSubMenu2, _T( "~CodePage" ) } ) oMenuBar:addItem( { oSubMenu, NIL } ) @@ -655,93 +655,6 @@ METHOD IdeActions:buildMainMenu() /*----------------------------------------------------------------------*/ -STATIC FUNCTION hbide_buildCodecMenu( oIde, oMenu ) - LOCAL oSubMenu, oSub1 - - oSubMenu := XbpMenu():new( oMenu ):create() - - oSubMenu:addItem( { "Apple Roman " , {|| oIde:setCodec( "Apple Roman" ) } } ) - oSubMenu:addItem( { "Big5 " , {|| oIde:setCodec( "Big5" ) } } ) - oSubMenu:addItem( { "Big5-HKSCS " , {|| oIde:setCodec( "Big5-HKSCS" ) } } ) - oSubMenu:addItem( { "CP949 " , {|| oIde:setCodec( "CP949" ) } } ) - oSubMenu:addItem( { "EUC-JP " , {|| oIde:setCodec( "EUC-JP" ) } } ) - oSubMenu:addItem( { "EUC-KR " , {|| oIde:setCodec( "EUC-KR" ) } } ) - oSubMenu:addItem( { "GB18030-0 " , {|| oIde:setCodec( "GB18030-0" ) } } ) - oSubMenu:addItem( { "IBM 850 " , {|| oIde:setCodec( "IBM 850" ) } } ) - oSubMenu:addItem( { "IBM 866 " , {|| oIde:setCodec( "IBM 866" ) } } ) - oSubMenu:addItem( { "IBM 874 " , {|| oIde:setCodec( "IBM 874" ) } } ) - oSubMenu:addItem( { "ISO 2022-JP " , {|| oIde:setCodec( "ISO 2022-JP" ) } } ) - - oSub1 := XbpMenu():new( oSubMenu ):create() - oSub1:title := "ISO 8859-1 to 10" - oSub1:addItem( { "ISO 8859-1" , {|| oIde:setCodec( "ISO 8859-1" ) } } ) - oSub1:addItem( { "ISO 8859-2" , {|| oIde:setCodec( "ISO 8859-2" ) } } ) - oSub1:addItem( { "ISO 8859-3" , {|| oIde:setCodec( "ISO 8859-3" ) } } ) - oSub1:addItem( { "ISO 8859-4" , {|| oIde:setCodec( "ISO 8859-4" ) } } ) - oSub1:addItem( { "ISO 8859-5" , {|| oIde:setCodec( "ISO 8859-5" ) } } ) - oSub1:addItem( { "ISO 8859-6" , {|| oIde:setCodec( "ISO 8859-6" ) } } ) - oSub1:addItem( { "ISO 8859-7" , {|| oIde:setCodec( "ISO 8859-7" ) } } ) - oSub1:addItem( { "ISO 8859-8" , {|| oIde:setCodec( "ISO 8859-8" ) } } ) - oSub1:addItem( { "ISO 8859-9" , {|| oIde:setCodec( "ISO 8859-9" ) } } ) - oSub1:addItem( { "ISO 8859-10" , {|| oIde:setCodec( "ISO 8859-10" ) } } ) - oSubMenu:addItem( { oSub1, NIL } ) - - oSub1 := XbpMenu():new( oSubMenu ):create() - oSub1:title := "ISO 8859-13 to 16" - oSub1:addItem( { "ISO 8859-13" , {|| oIde:setCodec( "ISO 8859-13" ) } } ) - oSub1:addItem( { "ISO 8859-14" , {|| oIde:setCodec( "ISO 8859-14" ) } } ) - oSub1:addItem( { "ISO 8859-15" , {|| oIde:setCodec( "ISO 8859-15" ) } } ) - oSub1:addItem( { "ISO 8859-16" , {|| oIde:setCodec( "ISO 8859-16" ) } } ) - oSubMenu:addItem( { oSub1, NIL } ) - - oSub1 := XbpMenu():new( oSubMenu ):create() - oSub1:title := "Iscii" - oSub1:addItem( { "Iscii-Bng" , {|| oIde:setCodec( "Iscii-Bng" ) } } ) - oSub1:addItem( { "Iscii-Dev" , {|| oIde:setCodec( "Iscii-Dev" ) } } ) - oSub1:addItem( { "Iscii-Gjr" , {|| oIde:setCodec( "Iscii-Gjr" ) } } ) - oSub1:addItem( { "Iscii-Knd" , {|| oIde:setCodec( "Iscii-Knd" ) } } ) - oSub1:addItem( { "Iscii-Mlm" , {|| oIde:setCodec( "Iscii-Mlm" ) } } ) - oSub1:addItem( { "Iscii-Ori" , {|| oIde:setCodec( "Iscii-Ori" ) } } ) - oSub1:addItem( { "Iscii-Pnj" , {|| oIde:setCodec( "Iscii-Pnj" ) } } ) - oSub1:addItem( { "Iscii-Tlg" , {|| oIde:setCodec( "Iscii-Tlg" ) } } ) - oSub1:addItem( { "Iscii-Tml" , {|| oIde:setCodec( "Iscii-Tml" ) } } ) - oSubMenu:addItem( { oSub1, NIL } ) - - oSubMenu:addItem( { "JIS X 0201 " , {|| oIde:setCodec( "JIS X 0201" ) } } ) - oSubMenu:addItem( { "JIS X 0208 " , {|| oIde:setCodec( "JIS X 0208" ) } } ) - oSubMenu:addItem( { "KOI8-R " , {|| oIde:setCodec( "KOI8-R" ) } } ) - oSubMenu:addItem( { "KOI8-U " , {|| oIde:setCodec( "KOI8-U" ) } } ) - oSubMenu:addItem( { "MuleLao-1 " , {|| oIde:setCodec( "MuleLao-1" ) } } ) - oSubMenu:addItem( { "ROMAN8 " , {|| oIde:setCodec( "ROMAN8" ) } } ) - oSubMenu:addItem( { "Shift-JIS " , {|| oIde:setCodec( "Shift-JIS" ) } } ) - oSubMenu:addItem( { "TIS-620 " , {|| oIde:setCodec( "TIS-620" ) } } ) - oSubMenu:addItem( { "TSCII " , {|| oIde:setCodec( "TSCII" ) } } ) - oSubMenu:addItem( { "UTF-8 " , {|| oIde:setCodec( "UTF-8" ) } } ) - oSubMenu:addItem( { "UTF-16 " , {|| oIde:setCodec( "UTF-16" ) } } ) - oSubMenu:addItem( { "UTF-16BE " , {|| oIde:setCodec( "UTF-16BE" ) } } ) - oSubMenu:addItem( { "UTF-16LE " , {|| oIde:setCodec( "UTF-16LE" ) } } ) - oSubMenu:addItem( { "UTF-32 " , {|| oIde:setCodec( "UTF-32" ) } } ) - oSubMenu:addItem( { "UTF-32BE " , {|| oIde:setCodec( "UTF-32BE" ) } } ) - oSubMenu:addItem( { "UTF-32LE " , {|| oIde:setCodec( "UTF-32LE" ) } } ) - - oSub1 := XbpMenu():new( oSubMenu ):create() - oSub1:title := "Windows-1250 to 1258" - oSub1:addItem( { "Windows-1250" , {|| oIde:setCodec( "Windows-1250" ) } } ) - oSub1:addItem( { "Windows-1251" , {|| oIde:setCodec( "Windows-1251" ) } } ) - oSub1:addItem( { "Windows-1252" , {|| oIde:setCodec( "Windows-1252" ) } } ) - oSub1:addItem( { "Windows-1253" , {|| oIde:setCodec( "Windows-1253" ) } } ) - oSub1:addItem( { "Windows-1254" , {|| oIde:setCodec( "Windows-1254" ) } } ) - oSub1:addItem( { "Windows-1255" , {|| oIde:setCodec( "Windows-1255" ) } } ) - oSub1:addItem( { "Windows-1256" , {|| oIde:setCodec( "Windows-1256" ) } } ) - oSub1:addItem( { "Windows-1257" , {|| oIde:setCodec( "Windows-1257" ) } } ) - oSub1:addItem( { "Windows-1258" , {|| oIde:setCodec( "Windows-1258" ) } } ) - oSubMenu:addItem( { oSub1, NIL } ) - - oSubMenu:addItem( { "WINSAMI2 " , {|| oIde:setCodec( "WINSAMI2" ) } } ) - - RETURN oSubMenu - -/*----------------------------------------------------------------------*/ /* * Normalizes a caption for an menu item with shortcut (or not). * TODO: add support for translation of menu items AND support changing shortcuts @@ -927,7 +840,7 @@ FUNCTION hbide_mnuFindItem( oIde, cCaption ) STATIC FUNCTION hbide_buildCDPMenu( oIde, oMenu ) LOCAL oSubMenu, cdp - oSubMenu := XbpMenu():new( oMenu ):create() + 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 ) ) } ) @@ -961,3 +874,91 @@ FUNCTION hbide_getCDPforID( cCodec ) RETURN cCodec /*----------------------------------------------------------------------*/ + +STATIC FUNCTION hbide_buildCodecMenu( oIde, oMenu ) + LOCAL oSubMenu, oSub1 + + oSubMenu := XbpMenu():new( oMenu ):create() + + oSubMenu:addItem( { "Apple Roman " , {|| oIde:setCodec( "Apple Roman" ) } } ) + oSubMenu:addItem( { "Big5 " , {|| oIde:setCodec( "Big5" ) } } ) + oSubMenu:addItem( { "Big5-HKSCS " , {|| oIde:setCodec( "Big5-HKSCS" ) } } ) + oSubMenu:addItem( { "CP949 " , {|| oIde:setCodec( "CP949" ) } } ) + oSubMenu:addItem( { "EUC-JP " , {|| oIde:setCodec( "EUC-JP" ) } } ) + oSubMenu:addItem( { "EUC-KR " , {|| oIde:setCodec( "EUC-KR" ) } } ) + oSubMenu:addItem( { "GB18030-0 " , {|| oIde:setCodec( "GB18030-0" ) } } ) + oSubMenu:addItem( { "IBM 850 " , {|| oIde:setCodec( "IBM 850" ) } } ) + oSubMenu:addItem( { "IBM 866 " , {|| oIde:setCodec( "IBM 866" ) } } ) + oSubMenu:addItem( { "IBM 874 " , {|| oIde:setCodec( "IBM 874" ) } } ) + oSubMenu:addItem( { "ISO 2022-JP " , {|| oIde:setCodec( "ISO 2022-JP" ) } } ) + + oSub1 := XbpMenu():new( oSubMenu ):create() + oSub1:title := "ISO 8859-1 to 10" + oSub1:addItem( { "ISO 8859-1" , {|| oIde:setCodec( "ISO 8859-1" ) } } ) + oSub1:addItem( { "ISO 8859-2" , {|| oIde:setCodec( "ISO 8859-2" ) } } ) + oSub1:addItem( { "ISO 8859-3" , {|| oIde:setCodec( "ISO 8859-3" ) } } ) + oSub1:addItem( { "ISO 8859-4" , {|| oIde:setCodec( "ISO 8859-4" ) } } ) + oSub1:addItem( { "ISO 8859-5" , {|| oIde:setCodec( "ISO 8859-5" ) } } ) + oSub1:addItem( { "ISO 8859-6" , {|| oIde:setCodec( "ISO 8859-6" ) } } ) + oSub1:addItem( { "ISO 8859-7" , {|| oIde:setCodec( "ISO 8859-7" ) } } ) + oSub1:addItem( { "ISO 8859-8" , {|| oIde:setCodec( "ISO 8859-8" ) } } ) + oSub1:addItem( { "ISO 8859-9" , {|| oIde:setCodec( "ISO 8859-9" ) } } ) + oSub1:addItem( { "ISO 8859-10" , {|| oIde:setCodec( "ISO 8859-10" ) } } ) + oSubMenu:addItem( { oSub1, NIL } ) + + oSub1 := XbpMenu():new( oSubMenu ):create() + oSub1:title := "ISO 8859-13 to 16" + oSub1:addItem( { "ISO 8859-13" , {|| oIde:setCodec( "ISO 8859-13" ) } } ) + oSub1:addItem( { "ISO 8859-14" , {|| oIde:setCodec( "ISO 8859-14" ) } } ) + oSub1:addItem( { "ISO 8859-15" , {|| oIde:setCodec( "ISO 8859-15" ) } } ) + oSub1:addItem( { "ISO 8859-16" , {|| oIde:setCodec( "ISO 8859-16" ) } } ) + oSubMenu:addItem( { oSub1, NIL } ) + + oSub1 := XbpMenu():new( oSubMenu ):create() + oSub1:title := "Iscii" + oSub1:addItem( { "Iscii-Bng" , {|| oIde:setCodec( "Iscii-Bng" ) } } ) + oSub1:addItem( { "Iscii-Dev" , {|| oIde:setCodec( "Iscii-Dev" ) } } ) + oSub1:addItem( { "Iscii-Gjr" , {|| oIde:setCodec( "Iscii-Gjr" ) } } ) + oSub1:addItem( { "Iscii-Knd" , {|| oIde:setCodec( "Iscii-Knd" ) } } ) + oSub1:addItem( { "Iscii-Mlm" , {|| oIde:setCodec( "Iscii-Mlm" ) } } ) + oSub1:addItem( { "Iscii-Ori" , {|| oIde:setCodec( "Iscii-Ori" ) } } ) + oSub1:addItem( { "Iscii-Pnj" , {|| oIde:setCodec( "Iscii-Pnj" ) } } ) + oSub1:addItem( { "Iscii-Tlg" , {|| oIde:setCodec( "Iscii-Tlg" ) } } ) + oSub1:addItem( { "Iscii-Tml" , {|| oIde:setCodec( "Iscii-Tml" ) } } ) + oSubMenu:addItem( { oSub1, NIL } ) + + oSubMenu:addItem( { "JIS X 0201 " , {|| oIde:setCodec( "JIS X 0201" ) } } ) + oSubMenu:addItem( { "JIS X 0208 " , {|| oIde:setCodec( "JIS X 0208" ) } } ) + oSubMenu:addItem( { "KOI8-R " , {|| oIde:setCodec( "KOI8-R" ) } } ) + oSubMenu:addItem( { "KOI8-U " , {|| oIde:setCodec( "KOI8-U" ) } } ) + oSubMenu:addItem( { "MuleLao-1 " , {|| oIde:setCodec( "MuleLao-1" ) } } ) + oSubMenu:addItem( { "ROMAN8 " , {|| oIde:setCodec( "ROMAN8" ) } } ) + oSubMenu:addItem( { "Shift-JIS " , {|| oIde:setCodec( "Shift-JIS" ) } } ) + oSubMenu:addItem( { "TIS-620 " , {|| oIde:setCodec( "TIS-620" ) } } ) + oSubMenu:addItem( { "TSCII " , {|| oIde:setCodec( "TSCII" ) } } ) + oSubMenu:addItem( { "UTF-8 " , {|| oIde:setCodec( "UTF-8" ) } } ) + oSubMenu:addItem( { "UTF-16 " , {|| oIde:setCodec( "UTF-16" ) } } ) + oSubMenu:addItem( { "UTF-16BE " , {|| oIde:setCodec( "UTF-16BE" ) } } ) + oSubMenu:addItem( { "UTF-16LE " , {|| oIde:setCodec( "UTF-16LE" ) } } ) + oSubMenu:addItem( { "UTF-32 " , {|| oIde:setCodec( "UTF-32" ) } } ) + oSubMenu:addItem( { "UTF-32BE " , {|| oIde:setCodec( "UTF-32BE" ) } } ) + oSubMenu:addItem( { "UTF-32LE " , {|| oIde:setCodec( "UTF-32LE" ) } } ) + + oSub1 := XbpMenu():new( oSubMenu ):create() + oSub1:title := "Windows-1250 to 1258" + oSub1:addItem( { "Windows-1250" , {|| oIde:setCodec( "Windows-1250" ) } } ) + oSub1:addItem( { "Windows-1251" , {|| oIde:setCodec( "Windows-1251" ) } } ) + oSub1:addItem( { "Windows-1252" , {|| oIde:setCodec( "Windows-1252" ) } } ) + oSub1:addItem( { "Windows-1253" , {|| oIde:setCodec( "Windows-1253" ) } } ) + oSub1:addItem( { "Windows-1254" , {|| oIde:setCodec( "Windows-1254" ) } } ) + oSub1:addItem( { "Windows-1255" , {|| oIde:setCodec( "Windows-1255" ) } } ) + oSub1:addItem( { "Windows-1256" , {|| oIde:setCodec( "Windows-1256" ) } } ) + oSub1:addItem( { "Windows-1257" , {|| oIde:setCodec( "Windows-1257" ) } } ) + oSub1:addItem( { "Windows-1258" , {|| oIde:setCodec( "Windows-1258" ) } } ) + oSubMenu:addItem( { oSub1, NIL } ) + + oSubMenu:addItem( { "WINSAMI2 " , {|| oIde:setCodec( "WINSAMI2" ) } } ) + + RETURN oSubMenu + +/*----------------------------------------------------------------------*/