2001-12-16 14:53 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
This commit is contained in:
Viktor Szakats
@@ -8,6 +8,14 @@
|
||||
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
|
||||
*/
|
||||
|
||||
2001-12-16 14:53 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
|
||||
|
||||
* source/rtl/tbrowse.prg
|
||||
! DispCell() - Fixed displaying of logical fields.
|
||||
|
||||
* source/vm/estack.c
|
||||
+ Added language markers HB_I_()
|
||||
|
||||
2001-12-16 14:20 UTC+0200 Chen Kedem <niki@actcom.co.il>
|
||||
|
||||
* doc/en/lang.txt
|
||||
|
||||
@@ -1084,35 +1084,37 @@ METHOD DispCell( nColumn, nColor ) CLASS TBrowse
|
||||
LOCAL oCol := ::aColumns[nColumn]
|
||||
LOCAL ftmp := Eval(oCol:block)
|
||||
LOCAL cType := ValType( ftmp )
|
||||
LOCAL cPict := iif(empty(oCol:Picture), "", oCol:Picture)
|
||||
LOCAL cDisp
|
||||
LOCAL cPict := iif(Empty(oCol:Picture), "", oCol:Picture)
|
||||
|
||||
LOCAL tmp
|
||||
|
||||
// NOTE: When nColor is used as an array index we need to increment it by one since CLR_STANDARD is 0
|
||||
LOCAL cColor := iif(oCol:ColorBlock != NIL,;
|
||||
hb_ColorIndex(::ColorSpec, Eval(oCol:ColorBlock, ftmp)[nColor + 1] - 1),;
|
||||
hb_ColorIndex(::ColorSpec, nColor))
|
||||
|
||||
do case
|
||||
case cType $ "CM"
|
||||
cDisp := PadL(Transform(ftmp, cPict), oCol:Width)
|
||||
case cType $ "CM"
|
||||
DispOut( PadL(Transform(ftmp, cPict), oCol:Width ), cColor )
|
||||
|
||||
case cType == "N"
|
||||
cDisp := PadR(Transform(ftmp, cPict), oCol:Width)
|
||||
case cType == "N"
|
||||
DispOut( PadR(Transform(ftmp, cPict), oCol:Width ), cColor )
|
||||
|
||||
case cType == "D"
|
||||
cPict := iif(cPict == "", "@D", cPict)
|
||||
cDisp := PadR(Transform(ftmp, cPict), oCol:Width)
|
||||
case cType == "D"
|
||||
cPict := iif(cPict == "", "@D", cPict)
|
||||
DispOut( PadR(Transform(ftmp, cPict), oCol:Width ), cColor )
|
||||
|
||||
case cType == "L"
|
||||
cDisp := PadC(iif(ftmp, "T", "F"), oCol:Width)
|
||||
case cType == "L"
|
||||
tmp := PadC( "X", oCol:Width )
|
||||
DispOut( Space( Len( tmp ) - Len( LTrim( tmp ) ) ) )
|
||||
DispOut( iif(ftmp, "T", "F"), cColor )
|
||||
DispOut( Space( Len( tmp ) - Len( RTrim( tmp ) ) ) )
|
||||
|
||||
otherwise
|
||||
cDisp := Space(oCol:Width)
|
||||
otherwise
|
||||
DispOut( Space(oCol:Width), cColor )
|
||||
|
||||
endcase
|
||||
|
||||
// Display cell value
|
||||
DispOut(cDisp, cColor)
|
||||
|
||||
return cType
|
||||
|
||||
|
||||
|
||||
@@ -257,7 +257,7 @@ void hb_stackDispLocal( void )
|
||||
HB_TRACE(HB_TR_DEBUG, ("hb_stackDispLocal()"));
|
||||
|
||||
printf( hb_conNewLine() );
|
||||
printf( "Virtual Machine Stack Dump at %s(%i):", ( *(hb_stack.pBase) )->item.asSymbol.value->szName, ( *(hb_stack.pBase) )->item.asSymbol.lineno );
|
||||
printf( HB_I_("Virtual Machine Stack Dump at %s(%i):"), ( *(hb_stack.pBase) )->item.asSymbol.value->szName, ( *(hb_stack.pBase) )->item.asSymbol.lineno );
|
||||
printf( hb_conNewLine() );
|
||||
printf( "--------------------------" );
|
||||
|
||||
@@ -268,53 +268,53 @@ void hb_stackDispLocal( void )
|
||||
switch( hb_itemType( *pBase ) )
|
||||
{
|
||||
case HB_IT_NIL:
|
||||
printf( "NIL " );
|
||||
printf( HB_I_("NIL ") );
|
||||
break;
|
||||
|
||||
case HB_IT_ARRAY:
|
||||
if( hb_arrayIsObject( *pBase ) )
|
||||
printf( "OBJECT = %s ", hb_objGetClsName( *pBase ) );
|
||||
printf( HB_I_("OBJECT = %s "), hb_objGetClsName( *pBase ) );
|
||||
else
|
||||
printf( "ARRAY " );
|
||||
printf( HB_I_("ARRAY ") );
|
||||
break;
|
||||
|
||||
case HB_IT_BLOCK:
|
||||
printf( "BLOCK " );
|
||||
printf( HB_I_("BLOCK ") );
|
||||
break;
|
||||
|
||||
case HB_IT_DATE:
|
||||
{
|
||||
char szDate[ 9 ];
|
||||
printf( "DATE = \"%s\" ", hb_itemGetDS( *pBase, szDate ) );
|
||||
printf( HB_I_("DATE = \"%s\" "), hb_itemGetDS( *pBase, szDate ) );
|
||||
}
|
||||
break;
|
||||
|
||||
case HB_IT_DOUBLE:
|
||||
printf( "DOUBLE = %f ", hb_itemGetND( *pBase ) );
|
||||
printf( HB_I_("DOUBLE = %f "), hb_itemGetND( *pBase ) );
|
||||
break;
|
||||
|
||||
case HB_IT_LOGICAL:
|
||||
printf( "LOGICAL = %s ", hb_itemGetL( *pBase ) ? ".T." : ".F." );
|
||||
printf( HB_I_("LOGICAL = %s "), hb_itemGetL( *pBase ) ? ".T." : ".F." );
|
||||
break;
|
||||
|
||||
case HB_IT_LONG:
|
||||
printf( "LONG = %lu ", hb_itemGetNL( *pBase ) );
|
||||
printf( HB_I_("LONG = %lu "), hb_itemGetNL( *pBase ) );
|
||||
break;
|
||||
|
||||
case HB_IT_INTEGER:
|
||||
printf( "INTEGER = %i ", hb_itemGetNI( *pBase ) );
|
||||
printf( HB_I_("INTEGER = %i "), hb_itemGetNI( *pBase ) );
|
||||
break;
|
||||
|
||||
case HB_IT_STRING:
|
||||
printf( "STRING = \"%s\" ", hb_itemGetCPtr( *pBase ) );
|
||||
printf( HB_I_("STRING = \"%s\" "), hb_itemGetCPtr( *pBase ) );
|
||||
break;
|
||||
|
||||
case HB_IT_SYMBOL:
|
||||
printf( "SYMBOL = %s ", ( *pBase )->item.asSymbol.value->szName );
|
||||
printf( HB_I_("SYMBOL = %s "), ( *pBase )->item.asSymbol.value->szName );
|
||||
break;
|
||||
|
||||
default:
|
||||
printf( "UNKNOWN = TYPE %i ", hb_itemType( *pBase ) );
|
||||
printf( HB_I_("UNKNOWN = TYPE %i "), hb_itemType( *pBase ) );
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -333,11 +333,11 @@ void hb_stackDispCall( void )
|
||||
pBase = hb_stack.pItems + ( *pBase )->item.asSymbol.stackbase;
|
||||
|
||||
if( ( *( pBase + 1 ) )->type == HB_IT_ARRAY )
|
||||
sprintf( buffer, "Called from %s:%s(%i)", hb_objGetClsName( *(pBase + 1) ),
|
||||
sprintf( buffer, HB_I_("Called from %s:%s(%i)"), hb_objGetClsName( *(pBase + 1) ),
|
||||
( *pBase )->item.asSymbol.value->szName,
|
||||
( *pBase )->item.asSymbol.lineno );
|
||||
else
|
||||
sprintf( buffer, "Called from %s(%i)",
|
||||
sprintf( buffer, HB_I_("Called from %s(%i)"),
|
||||
( *pBase )->item.asSymbol.value->szName,
|
||||
( *pBase )->item.asSymbol.lineno );
|
||||
|
||||
@@ -387,11 +387,11 @@ WINBASEAPI LONG WINAPI UnhandledExceptionFilter( struct _EXCEPTION_POINTERS * Ex
|
||||
char buffer[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 32 ];
|
||||
|
||||
if( ( *( pBase + 1 ) )->type == HB_IT_ARRAY )
|
||||
sprintf( buffer, "Called from %s:%s(%i)\n", hb_objGetClsName( *(pBase + 1) ),
|
||||
sprintf( buffer, HB_I_("Called from %s:%s(%i)\n"), hb_objGetClsName( *(pBase + 1) ),
|
||||
( *pBase )->item.asSymbol.value->szName,
|
||||
( *pBase )->item.asSymbol.lineno );
|
||||
else
|
||||
sprintf( buffer, "Called from %s(%i)\n",
|
||||
sprintf( buffer, HB_I_("Called from %s(%i)\n"),
|
||||
( *pBase )->item.asSymbol.value->szName,
|
||||
( *pBase )->item.asSymbol.lineno );
|
||||
|
||||
@@ -401,7 +401,7 @@ WINBASEAPI LONG WINAPI UnhandledExceptionFilter( struct _EXCEPTION_POINTERS * Ex
|
||||
}
|
||||
while( pBase != hb_stack.pItems );
|
||||
|
||||
MessageBox( NULL, msg, "Harbour Exception", MB_ICONSTOP );
|
||||
MessageBox( NULL, msg, HB_I_("Harbour Exception"), MB_ICONSTOP );
|
||||
|
||||
return EXCEPTION_EXECUTE_HANDLER; /* EXCEPTION_CONTINUE_SEARCH; */
|
||||
}
|
||||
@@ -426,16 +426,16 @@ ULONG _System OS2TermHandler(PEXCEPTIONREPORTRECORD p1,
|
||||
during debugging */
|
||||
if (p1->ExceptionNum != XCPT_UNWIND && p1->ExceptionNum < XCPT_BREAKPOINT) {
|
||||
|
||||
fprintf(stderr, "\nException %lx at address %lx \n", p1->ExceptionNum, (ULONG)p1->ExceptionAddress);
|
||||
fprintf(stderr, HB_I_("\nException %lx at address %lx \n"), p1->ExceptionNum, (ULONG)p1->ExceptionAddress);
|
||||
|
||||
do
|
||||
{
|
||||
if( ( *( pBase + 1 ) )->type == HB_IT_ARRAY )
|
||||
fprintf( stderr, "Called from %s:%s(%i)\n", hb_objGetClsName( *(pBase + 1) ),
|
||||
fprintf( stderr, HB_I_("Called from %s:%s(%i)\n"), hb_objGetClsName( *(pBase + 1) ),
|
||||
( *pBase )->item.asSymbol.value->szName,
|
||||
( *pBase )->item.asSymbol.lineno );
|
||||
else
|
||||
fprintf( stderr, "Called from %s(%i)\n",
|
||||
fprintf( stderr, HB_I_("Called from %s(%i)\n"),
|
||||
( *pBase )->item.asSymbol.value->szName,
|
||||
( *pBase )->item.asSymbol.lineno );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user