Changeset 228


Ignore:
Timestamp:
Sep 9, 2007, 2:02:29 PM (18 years ago)
Author:
RBRi
Message:

refactoring for language handling

Location:
trunk/NewView
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/NewView/BookmarksFormUnit.pas

    r102 r228  
    8484Procedure TBookmarksForm.OnLanguageEvent( Language: TLanguageFile;
    8585                                          const Apply: boolean );
    86 begin
    87   LogEvent(LogI18n, 'TBookmarksForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
     86var
     87  tmpPrefix : String;
     88begin
     89  // LogEvent(LogI18n, 'TBookmarksForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
    8890  Language.LoadComponentLanguage( self, Apply );
    8991
    90   Language.LL( Apply, DeleteBookmarkTitle, 'DeleteBookmarkTitle', 'Delete Bookmark' );
    91   Language.LL( Apply, DeleteBookmarkA, 'DeleteBookmarkA', 'Delete the bookmark named ' );
    92   Language.LL( Apply, DeleteBookmarkB, 'DeleteBookmarkB', '?' );
    93   Language.LL( Apply, RenameBookmarkTitle, 'RenameBookmarkTitle', 'Rename Bookmark' );
    94   Language.LL( Apply, RenameBookmark, 'RenameBookmark', 'Enter the new name of the bookmark' );
     92  tmpPrefix := 'BookmarksForm' + LANGUAGE_LABEL_DELIMITER;
     93
     94  Language.LL( Apply, DeleteBookmarkTitle, tmpPrefix + 'DeleteBookmarkTitle', 'Delete Bookmark' );
     95  Language.LL( Apply, DeleteBookmarkA, tmpPrefix + 'DeleteBookmarkA', 'Delete the bookmark named ' );
     96  Language.LL( Apply, DeleteBookmarkB, tmpPrefix + 'DeleteBookmarkB', '?' );
     97  Language.LL( Apply, RenameBookmarkTitle, tmpPrefix + 'RenameBookmarkTitle', 'Rename Bookmark' );
     98  Language.LL( Apply, RenameBookmark, tmpPrefix + 'RenameBookmark', 'Enter the new name of the bookmark' );
    9599end;
    96100
    … …  
    114118Procedure TBookmarksForm.BookmarksFormOnCreate (Sender: TObject);
    115119Begin
    116   RegisterForLanguages( OnLanguageEvent );
     120  RegisterEventForLanguages( OnLanguageEvent );
    117121End;
    118122

  • trunk/NewView/FileDialogForm.pas

    r105 r228  
    559559Procedure TFileDialogForm.OnLanguageEvent( Language: TLanguageFile;
    560560                                           const Apply: boolean );
     561var
     562  tmpPrefix : String;
    561563begin
    562   LogEvent(LogI18n, 'TFileDialogForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
     564  // LogEvent(LogI18n, 'TFileDialogForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
    563565  Language.LoadComponentLanguage( self, Apply );
    564566
    565   Language.LL( Apply, InvalidFilterErrorTitle, 'InvalidFilterErrorTitle', 'File Filter Error' );
     567  tmpPrefix := 'FileDialogForm' + LANGUAGE_LABEL_DELIMITER;
     568
     569  Language.LL( Apply, InvalidFilterErrorTitle, tmpPrefix + 'InvalidFilterErrorTitle', 'File Filter Error' );
    566570  Language.LL( Apply,
    567571               InvalidFilterError,
    568                'InvalidFilterError',
     572               tmpPrefix + 'InvalidFilterError',
    569573               ' is not a valid filename filter. '
    570574               + 'You cannot use any of these characters: ' );
    571   Language.LL( Apply, FileNotFoundErrorTitle, 'FileNotFoundErrorTitle', 'File Not Found' );
    572   Language.LL( Apply, FileNotFoundError, 'FileNotFoundError', 'File does not exist:' );
    573   Language.LL( Apply, MultiSelectErrorTitle, 'MultiSelectErrorTitle', 'Multi-Select' );
    574   Language.LL( Apply, MultiSelectError, 'MultiSelectError', 'You can only select one file' );
     575  Language.LL( Apply, FileNotFoundErrorTitle, tmpPrefix + 'FileNotFoundErrorTitle', 'File Not Found' );
     576  Language.LL( Apply, FileNotFoundError, tmpPrefix + 'FileNotFoundError', 'File does not exist:' );
     577  Language.LL( Apply, MultiSelectErrorTitle, tmpPrefix + 'MultiSelectErrorTitle', 'Multi-Select' );
     578  Language.LL( Apply, MultiSelectError, tmpPrefix + 'MultiSelectError', 'You can only select one file' );
    575579end;
    576580
    577581Procedure TFileDialogForm.FileDialogFormOnCreate (Sender: TObject);
    578582Begin
    579   RegisterForLanguages( OnLanguageEvent );
     583  RegisterEventForLanguages( OnLanguageEvent );
    580584
    581585  FileMask := '*.*';

  • trunk/NewView/GlobalSearchForm.pas

    r191 r228  
    318318
    319319Procedure TGlobalSearchForm.OnLanguageEvent(Language: TLanguageFile; const Apply: boolean );
    320 begin
    321   LogEvent(LogI18n, 'TGlobalSearchForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
     320var
     321  tmpPrefix : String;
     322begin
     323  // LogEvent(LogI18n, 'TGlobalSearchForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
    322324
    323325  Language.LoadComponentLanguage(self, Apply);
    324326
    325   Language.LL(Apply, SearchCaption, 'SearchCaption', '~Search');
    326   Language.LL(Apply, StopCaption, 'StopCaption', '~Stop');
    327   Language.LL(Apply, NoResultsMsg, 'NoResultsMsg', '(No results found)');
    328   Language.LL(Apply, ScanDirectoriesMsg, 'ScanDirectoriesMsg', 'Finding help files...');
    329   Language.LL(Apply, SearchingFileMsg, 'SearchingFileMsg', 'Searching ');
    330   Language.LL(Apply, OfMsg, 'OfMsg', ' of ');
    331   Language.LL(Apply, DoneMsg, 'DoneMsg', 'Done');
    332   Language.LL(Apply, SearchErrorTitle, 'SearchErrorTitle', 'Search');
    333   Language.LL(Apply, SearchError, 'SearchError', 'Error in search syntax: ');
    334 
    335   Language.LL(Apply, StandardHelpPathsLocation, 'StandardHelpPathsLocation', 'Standard Help Paths');
    336   Language.LL(Apply, FixedDrivesLocation, 'FixedDrivesLocation', 'All Hard Drives');
    337   Language.LL(Apply, SelectedHelpPathsLocation, 'SelectedHelpPathsLocation', 'Selected Help Paths');
    338   Language.LL(Apply, CustomPathsLocation, 'CustomPathsLocation', 'Directory List');
     327  tmpPrefix := 'GlobalSearchForm' + LANGUAGE_LABEL_DELIMITER;
     328
     329  Language.LL(Apply, SearchCaption, tmpPrefix + 'SearchCaption', '~Search');
     330  Language.LL(Apply, StopCaption, tmpPrefix + 'StopCaption', '~Stop');
     331  Language.LL(Apply, NoResultsMsg, tmpPrefix + 'NoResultsMsg', '(No results found)');
     332  Language.LL(Apply, ScanDirectoriesMsg, tmpPrefix + 'ScanDirectoriesMsg', 'Finding help files...');
     333  Language.LL(Apply, SearchingFileMsg, tmpPrefix + 'SearchingFileMsg', 'Searching ');
     334  Language.LL(Apply, OfMsg, tmpPrefix + 'OfMsg', ' of ');
     335  Language.LL(Apply, DoneMsg, tmpPrefix + 'DoneMsg', 'Done');
     336  Language.LL(Apply, SearchErrorTitle, tmpPrefix + 'SearchErrorTitle', 'Search');
     337  Language.LL(Apply, SearchError, tmpPrefix + 'SearchError', 'Error in search syntax: ');
     338
     339  Language.LL(Apply, StandardHelpPathsLocation, tmpPrefix + 'StandardHelpPathsLocation', 'Standard Help Paths');
     340  Language.LL(Apply, FixedDrivesLocation, tmpPrefix + 'FixedDrivesLocation', 'All Hard Drives');
     341  Language.LL(Apply, SelectedHelpPathsLocation, tmpPrefix + 'SelectedHelpPathsLocation', 'Selected Help Paths');
     342  Language.LL(Apply, CustomPathsLocation, tmpPrefix + 'CustomPathsLocation', 'Directory List');
    339343end;
    340344
    … …  
    403407Procedure TGlobalSearchForm.GlobalSearchFormOnCreate (Sender: TObject);
    404408Begin
    405   RegisterForLanguages( OnLanguageEvent );
     409  RegisterEventForLanguages( OnLanguageEvent );
    406410
    407411  UpdateButtons;
    … …  
    749753  RegisterClasses ([TGlobalSearchForm, TEdit, TLabel,
    750754    TProgressBar, TButton, TOutline2, TComboBox, TBevel, TLed, TTimer]);
    751   RegisterUpdateProcForLanguages( EnsureGlobalSearchFormLoaded );
     755
     756  RegisterUpdateProcForLanguages(EnsureGlobalSearchFormLoaded);
    752757End.

  • trunk/NewView/HelpFile.pas

    r140 r228  
    173173Procedure OnLanguageEvent( Language: TLanguageFile;
    174174                           const Apply: boolean );
    175 begin
    176 
    177   Language.Prefix := 'HelpFile.';
    178   Language.LL( Apply, FileErrorNotFound, 'FileErrorNotFound', 'File not found' );
    179   Language.LL( Apply, FileErrorAccessDenied, 'FileErrorAccessDenied', 'Access denied' );
    180   Language.LL( Apply, FileErrorInUse, 'FileErrorInUse', 'File in use by another program' );
     175var
     176  tmpPrefix : String;
     177begin
     178  tmpPrefix := 'HelpFile' + LANGUAGE_LABEL_DELIMITER;
     179
     180  Language.LL( Apply, FileErrorNotFound, tmpPrefix + 'FileErrorNotFound', 'File not found' );
     181  Language.LL( Apply, FileErrorAccessDenied, tmpPrefix + 'FileErrorAccessDenied', 'Access denied' );
     182  Language.LL( Apply, FileErrorInUse, tmpPrefix + 'FileErrorInUse', 'File in use by another program' );
    181183  Language.LL( Apply,
    182184               FileErrorInvalidHeader,
    183                'FileErrorInvalidHeader',
     185               tmpPrefix + 'FileErrorInvalidHeader',
    184186               'File doesn''t appear to be an OS/2 Help document (header ID not correct)' );
    185187  Language.LL( Apply,
    186188               ErrorCorruptHelpFile,
    187                'ErrorCorruptHelpFile',
     189               tmpPrefix + 'ErrorCorruptHelpFile',
    188190               'File is corrupt' );
    189191end;

  • trunk/NewView/HelpTopic.pas

    r140 r228  
    311311                           const Apply: boolean );
    312312begin
    313   Language.Prefix := 'HelpTopic.';
    314   Language.LL( Apply, DefaultTitle, 'DefaultTitle', '(No title)' );
     313  Language.LL( Apply, DefaultTitle, 'HelpTopic' + LANGUAGE_LABEL_DELIMITER + 'DefaultTitle', '(No title)' );
    315314end;
    316315

  • trunk/NewView/InformationFormUnit.pas

    r94 r228  
    5656Procedure TInformationForm.InformationFormOnCreate (Sender: TObject);
    5757Begin
    58   RegisterForLanguages( OnLanguageEvent );
     58  RegisterEventForLanguages( OnLanguageEvent );
    5959End;
    6060
    … …  
    6262                                            const Apply: boolean );
    6363begin
    64   LogEvent(LogI18n, 'TInformationForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
     64  // LogEvent(LogI18n, 'TInformationForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
    6565  Language.LoadComponentLanguage( self, Apply );
    6666end;

  • trunk/NewView/MainForm.pas

    r165 r228  
    462462    // language stuff
    463463    // called by callback
    464     Procedure OnLanguageEvent( Language: TLanguageFile;
    465                                const Apply: boolean );
     464    Procedure OnLanguageEvent(Language: TLanguageFile; const Apply: boolean );
    466465
    467466    function ShowCodes: boolean;
    … …  
    13651364end;
    13661365
    1367 Procedure TMainForm.OnLanguageEvent( Language: TLanguageFile;
    1368                                      const Apply: boolean );
     1366Procedure TMainForm.OnLanguageEvent(Language: TLanguageFile; const Apply: boolean);
     1367var
     1368  tmpPrefix : String;
    13691369Begin
    13701370  // get rid of mru menu items
    … …  
    13911391  // Load strings referred to by code...
    13921392  // ----------------------------------------------------------
    1393 
    1394   Language.LL( Apply, FileOpenTitle, 'FileOpenTitle', 'Open Help Files' );
    1395   Language.LL( Apply, LoadingFileMsg, 'LoadingFileMsg', 'Loading file ' );
    1396   Language.LL( Apply, HelpFileError, 'HelpFileError', 'Could not open ' );
    1397   Language.LL( Apply, LoadingStatusDisplaying, 'LoadingStatusDisplaying', 'Displaying...' );
    1398   Language.LL( Apply, LoadingStatusNotesAndBookmarks, 'LoadingStatusNotesAndBookmarks', 'Loading notes/bookmarks...' );
    1399   Language.LL( Apply, LoadingStatusContents, 'LoadingStatusContents', 'Display contents... ' );
    1400   Language.LL( Apply, LoadingStatusIndex, 'LoadingStatusIndex', 'Display index... ' );
    1401   Language.LL( Apply, LoadingStatusDone, 'LoadingStatusDone', 'Done' );
    1402 
    1403   Language.LL( Apply, HelpFilesDesc, 'HelpFilesDesc', 'Help Files (*.inf,*.hlp)' );
    1404   Language.LL( Apply, AllFilesDesc, 'AllFilesDesc', 'All Files (*)' );
    1405   Language.LL( Apply, LanguageFilesDesc, 'LanguageFilesDesc', 'NewView Language Files (*.lng)' );
    1406 
    1407   Language.LL( Apply, SaveLanguageTitle, 'SaveLanguageTitle', 'Save/Update Language File' );
    1408   Language.LL( Apply, OpenLanguageTitle, 'OpenLanguageTitle', 'Open Language File' );
    1409   Language.LL( Apply, SaveLanguageError, 'SaveLanguageError', 'Error saving language file: ' );
    1410 
    1411   Language.LL( Apply, HelpManagerVersionTitle, 'HelpManagerVersionTitle', 'Help Manager Version' );
    1412 
    1413   Language.LL( Apply, FindResourceIDTitle, 'FindResourceIDTitle', 'Find Resource ID' );
    1414   Language.LL( Apply, FindResourceIDPrompt, 'FindResourceIDPrompt', 'Enter the resource ID to find' );
    1415   Language.LL( Apply, InvalidResourceIDError, 'InvalidResourceIDError', 'Invalid resource ID entered' );
    1416   Language.LL( Apply, ResourceIDNotFoundError, 'ResourceIDNotFoundError', 'Resource ID not found' );
    1417 
    1418   Language.LL( Apply, OpenSpecialTitle, 'OpenSpecialTitle', 'Open Special' );
    1419   Language.LL( Apply, OpenSpecialPrompt, 'OpenSpecialPrompt', 'Enter help filename/environment variable name' );
    1420 
    1421   Language.LL( Apply, PrintTopicTitle, 'PrintTopicTitle', 'Print Topic' );
    1422   Language.LL( Apply, NoPrinterError, 'NoPrinterError', 'You don''t have a printer configured.' );
    1423   Language.LL( Apply, SelectWindowToPrintError, 'SelectWindowToPrintError', 'You must select the window you want to print.' );
    1424   Language.LL( Apply, PrintingError, 'PrintingError', 'Error while printing: ' );
    1425   Language.LL( Apply, StoppingPrintMsg, 'StoppingPrintMsg', 'Stopping print...' );
    1426   Language.LL( Apply, PrintStoppedMsg, 'PrintStoppedMsg', 'Printing stopped' );
    1427   Language.LL( Apply, CheckStopPrintTitle, 'CheckStopPrintTitle', 'Stop Print?' );
    1428   Language.LL( Apply, CheckStopPrintMsg, 'CheckStopPrintMsg', 'Printing is still in progress. It will be stopped if you close.' );
    1429 
    1430   Language.LL( Apply, TopicInfoTitle, 'TopicInfo.Title', 'Topic Information' );
    1431   Language.LL( Apply, TopicInfoTopicTitle, 'TopicInfo.TopicTitle',   'Title: ' );
    1432   Language.LL( Apply, TopicInfoIndex, 'TopicInfo.Index',             'Index: ' );
    1433   Language.LL( Apply, TopicInfoFile, 'TopicInfo.File',               'File:  ' );
    1434   Language.LL( Apply, TopicInfoResourceIDs, 'TopicInfo.ResourceIDs', 'Resource IDs:' );
    1435   Language.LL( Apply, TopicInfoNoResourceIDs, 'TopicInfo.NoResourceIDs', '  (None)' );
    1436 
    1437   Language.LL( Apply, ParameterCountLabel, 'ParameterCountLabel', 'Parameter Count: ' );
    1438 
    1439   Language.LL( Apply, NewViewHelpTitle, 'NewViewHelpTitle', 'NewView Help' );
    1440   Language.LL( Apply, AlreadyNewviewHelp, 'AlreadyNewviewHelp', 'You are already viewing the NewView help file' );
    1441   Language.LL( Apply, NewViewHelpNotFound, 'NewViewHelpNotFound', 'Couldn''t find the NewView helpfile: ' );
    1442 
    1443   Language.LL( Apply, InvalidLinkErrorTitle, 'InvalidLinkErrorTitle', 'Invalid Link' );
    1444   Language.LL( Apply, InvalidLinkError, 'InvalidLinkError', 'Cannot follow link to nonexistent topic' );
    1445   Language.LL( Apply, InvalidResourceIDLinkErrorA, 'InvalidResourceIDLinkErrorA', 'Could not find linked topic (Resource #' );
    1446   Language.LL( Apply, InvalidResourceIDLinkErrorB, 'InvalidResourceIDLinkErrorB', '). This may be from another file.' );
    1447 
    1448   Language.LL( Apply, OpenedTopicMsg, 'OpenedTopicMsg', 'Opened topic #' );
    1449 
    1450   Language.LL( Apply, AddNoteTitle, 'AddNoteTitle', 'Add Note' );
    1451   Language.LL( Apply, AddNoteCursorError, 'AddNoteCursorError', 'Before adding a note, position the cursor where you want the note to be placed.' );
    1452   Language.LL( Apply, NoteWithinNoteError, 'NoteWithinNoteError', 'You can''t add a note within a link or another note' );
    1453   Language.LL( Apply, LoadNotesTitle, 'LoadNotesTitle', 'Load Notes' );
    1454   Language.LL( Apply, LoadNotesError, 'LoadNotesError', 'Error loading notes from ' );
    1455   Language.LL( Apply, SaveNotesTitle, 'SaveNotesTitle', 'Save Notes' );
    1456   Language.LL( Apply, SaveNotesError, 'SaveNotesError', 'Error saving notes to ' );
    1457 
    1458   Language.LL( Apply, UntitledBookmarkName, 'UntitledBookmarkName', '(Untitled)' );
    1459   Language.LL( Apply, LoadBookmarksTitle, 'LoadBookmarksTitle', 'Load Bookmarks' );
    1460   Language.LL( Apply, LoadBookmarksError, 'LoadBookmarksError', 'Could not load bookmarks: ' );
    1461   Language.LL( Apply, SaveBookmarksTitle, 'SaveBookmarksTitle', 'Save Bookmarks' );
    1462   Language.LL( Apply, SaveBookmarksError, 'SaveBookmarksError', 'Could not save bookmarks: ' );
    1463 
    1464   Language.LL( Apply, ApplicationErrorTitle, 'ApplicationErrorTitle', 'Application Error - Close?' );
    1465   Language.LL( Apply, ApplicationErrorA, 'ApplicationErrorA', 'This application has crashed. ' );
    1466   Language.LL( Apply, ApplicationErrorB, 'ApplicationErrorB', '(Details logged to ' );
    1467   Language.LL( Apply, ApplicationErrorC, 'ApplicationErrorC', 'Close application? ' );
    1468 
    1469   Language.LL( Apply, EnvironmentVarErrorTitle, 'EnvironmentVarErrorTitle', 'Environment Variable Warning' );
     1393  tmpPrefix := 'MainForm' + LANGUAGE_LABEL_DELIMITER;
     1394
     1395  Language.LL( Apply, FileOpenTitle, tmpPrefix + 'FileOpenTitle', 'Open Help Files' );
     1396  Language.LL( Apply, LoadingFileMsg, tmpPrefix + 'LoadingFileMsg', 'Loading file ' );
     1397  Language.LL( Apply, HelpFileError, tmpPrefix + 'HelpFileError', 'Could not open ' );
     1398  Language.LL( Apply, LoadingStatusDisplaying, tmpPrefix + 'LoadingStatusDisplaying', 'Displaying...' );
     1399  Language.LL( Apply, LoadingStatusNotesAndBookmarks, tmpPrefix + 'LoadingStatusNotesAndBookmarks', 'Loading notes/bookmarks...' );
     1400  Language.LL( Apply, LoadingStatusContents, tmpPrefix + 'LoadingStatusContents', 'Display contents... ' );
     1401  Language.LL( Apply, LoadingStatusIndex, tmpPrefix + 'LoadingStatusIndex', 'Display index... ' );
     1402  Language.LL( Apply, LoadingStatusDone, tmpPrefix + 'LoadingStatusDone', 'Done' );
     1403
     1404  Language.LL( Apply, HelpFilesDesc, tmpPrefix + 'HelpFilesDesc', 'Help Files (*.inf,*.hlp)' );
     1405  Language.LL( Apply, AllFilesDesc, tmpPrefix + 'AllFilesDesc', 'All Files (*)' );
     1406  Language.LL( Apply, LanguageFilesDesc, tmpPrefix + 'LanguageFilesDesc', 'NewView Language Files (*.lng)' );
     1407
     1408  Language.LL( Apply, SaveLanguageTitle, tmpPrefix + 'SaveLanguageTitle', 'Save/Update Language File' );
     1409  Language.LL( Apply, OpenLanguageTitle, tmpPrefix + 'OpenLanguageTitle', 'Open Language File' );
     1410  Language.LL( Apply, SaveLanguageError, tmpPrefix + 'SaveLanguageError', 'Error saving language file: ' );
     1411
     1412  Language.LL( Apply, HelpManagerVersionTitle, tmpPrefix + 'HelpManagerVersionTitle', 'Help Manager Version' );
     1413
     1414  Language.LL( Apply, FindResourceIDTitle, tmpPrefix + 'FindResourceIDTitle', 'Find Resource ID' );
     1415  Language.LL( Apply, FindResourceIDPrompt, tmpPrefix + 'FindResourceIDPrompt', 'Enter the resource ID to find' );
     1416  Language.LL( Apply, InvalidResourceIDError, tmpPrefix + 'InvalidResourceIDError', 'Invalid resource ID entered' );
     1417  Language.LL( Apply, ResourceIDNotFoundError, tmpPrefix + 'ResourceIDNotFoundError', 'Resource ID not found' );
     1418
     1419  Language.LL( Apply, OpenSpecialTitle, tmpPrefix + 'OpenSpecialTitle', 'Open Special' );
     1420  Language.LL( Apply, OpenSpecialPrompt, tmpPrefix + 'OpenSpecialPrompt', 'Enter help filename/environment variable name' );
     1421
     1422  Language.LL( Apply, PrintTopicTitle, tmpPrefix + 'PrintTopicTitle', 'Print Topic' );
     1423  Language.LL( Apply, NoPrinterError, tmpPrefix + 'NoPrinterError', 'You don''t have a printer configured.' );
     1424  Language.LL( Apply, SelectWindowToPrintError, tmpPrefix + 'SelectWindowToPrintError', 'You must select the window you want to print.' );
     1425  Language.LL( Apply, PrintingError, tmpPrefix + 'PrintingError', 'Error while printing: ' );
     1426  Language.LL( Apply, StoppingPrintMsg, tmpPrefix + 'StoppingPrintMsg', 'Stopping print...' );
     1427  Language.LL( Apply, PrintStoppedMsg, tmpPrefix + 'PrintStoppedMsg', 'Printing stopped' );
     1428  Language.LL( Apply, CheckStopPrintTitle, tmpPrefix + 'CheckStopPrintTitle', 'Stop Print?' );
     1429  Language.LL( Apply, CheckStopPrintMsg, tmpPrefix + 'CheckStopPrintMsg', 'Printing is still in progress. It will be stopped if you close.' );
     1430
     1431  Language.LL( Apply, TopicInfoTitle, tmpPrefix + 'TopicInfo.Title', 'Topic Information' );
     1432  Language.LL( Apply, TopicInfoTopicTitle, tmpPrefix + 'TopicInfo.TopicTitle',   'Title: ' );
     1433  Language.LL( Apply, TopicInfoIndex, tmpPrefix + 'TopicInfo.Index',             'Index: ' );
     1434  Language.LL( Apply, TopicInfoFile, tmpPrefix + 'TopicInfo.File',               'File:  ' );
     1435  Language.LL( Apply, TopicInfoResourceIDs, tmpPrefix + 'TopicInfo.ResourceIDs', 'Resource IDs:' );
     1436  Language.LL( Apply, TopicInfoNoResourceIDs, tmpPrefix + 'TopicInfo.NoResourceIDs', '  (None)' );
     1437
     1438  Language.LL( Apply, ParameterCountLabel, tmpPrefix + 'ParameterCountLabel', 'Parameter Count: ' );
     1439
     1440  Language.LL( Apply, NewViewHelpTitle, tmpPrefix + 'NewViewHelpTitle', 'NewView Help' );
     1441  Language.LL( Apply, AlreadyNewviewHelp, tmpPrefix + 'AlreadyNewviewHelp', 'You are already viewing the NewView help file' );
     1442  Language.LL( Apply, NewViewHelpNotFound, tmpPrefix + 'NewViewHelpNotFound', 'Couldn''t find the NewView helpfile: ' );
     1443
     1444  Language.LL( Apply, InvalidLinkErrorTitle, tmpPrefix + 'InvalidLinkErrorTitle', 'Invalid Link' );
     1445  Language.LL( Apply, InvalidLinkError, tmpPrefix + 'InvalidLinkError', 'Cannot follow link to nonexistent topic' );
     1446  Language.LL( Apply, InvalidResourceIDLinkErrorA, tmpPrefix + 'InvalidResourceIDLinkErrorA', 'Could not find linked topic (Resource #' );
     1447  Language.LL( Apply, InvalidResourceIDLinkErrorB, tmpPrefix + 'InvalidResourceIDLinkErrorB', '). This may be from another file.' );
     1448
     1449  Language.LL( Apply, OpenedTopicMsg, tmpPrefix + 'OpenedTopicMsg', 'Opened topic #' );
     1450
     1451  Language.LL( Apply, AddNoteTitle, tmpPrefix + 'AddNoteTitle', 'Add Note' );
     1452  Language.LL( Apply, AddNoteCursorError, tmpPrefix + 'AddNoteCursorError', 'Before adding a note, position the cursor where you want the note to be placed.' );
     1453  Language.LL( Apply, NoteWithinNoteError, tmpPrefix + 'NoteWithinNoteError', 'You can''t add a note within a link or another note' );
     1454  Language.LL( Apply, LoadNotesTitle, tmpPrefix + 'LoadNotesTitle', 'Load Notes' );
     1455  Language.LL( Apply, LoadNotesError, tmpPrefix + 'LoadNotesError', 'Error loading notes from ' );
     1456  Language.LL( Apply, SaveNotesTitle, tmpPrefix + 'SaveNotesTitle', 'Save Notes' );
     1457  Language.LL( Apply, SaveNotesError, tmpPrefix + 'SaveNotesError', 'Error saving notes to ' );
     1458
     1459  Language.LL( Apply, UntitledBookmarkName, tmpPrefix + 'UntitledBookmarkName', '(Untitled)' );
     1460  Language.LL( Apply, LoadBookmarksTitle, tmpPrefix + 'LoadBookmarksTitle', 'Load Bookmarks' );
     1461  Language.LL( Apply, LoadBookmarksError, tmpPrefix + 'LoadBookmarksError', 'Could not load bookmarks: ' );
     1462  Language.LL( Apply, SaveBookmarksTitle, tmpPrefix + 'SaveBookmarksTitle', 'Save Bookmarks' );
     1463  Language.LL( Apply, SaveBookmarksError, tmpPrefix + 'SaveBookmarksError', 'Could not save bookmarks: ' );
     1464
     1465  Language.LL( Apply, ApplicationErrorTitle, tmpPrefix + 'ApplicationErrorTitle', 'Application Error - Close?' );
     1466  Language.LL( Apply, ApplicationErrorA, tmpPrefix + 'ApplicationErrorA', 'This application has crashed. ' );
     1467  Language.LL( Apply, ApplicationErrorB, tmpPrefix + 'ApplicationErrorB', '(Details logged to ' );
     1468  Language.LL( Apply, ApplicationErrorC, tmpPrefix + 'ApplicationErrorC', 'Close application? ' );
     1469
     1470  Language.LL( Apply, EnvironmentVarErrorTitle, tmpPrefix + 'EnvironmentVarErrorTitle', 'Environment Variable Warning' );
    14701471  Language.LL( Apply, EnvironmentVarError,
    1471       'EnvironmentVarError',
     1472      tmpPrefix + 'EnvironmentVarError',
    14721473      'NewView found a problem with environment variables. '
    14731474      + 'These are used when finding help files. '
    14741475      + 'You may have problems launching help.' );
    1475   Language.LL( Apply, EnvironmentVarUndefined, 'EnvironmentVarUndefined', 'Undefined: ' );
    1476 
    1477   Language.LL( Apply, FindTitle, 'FindTitle', 'Find' );
    1478   Language.LL( Apply, FindSelectWindowError, 'FindSelectWindowError', 'Click in a window first' );
    1479   Language.LL( Apply, FindPrompt, 'FindPrompt', 'Enter the text to find' );
    1480   Language.LL( Apply, TextNotFoundMsg, 'TextNotFoundMsg', 'Text not found' );
    1481 
    1482   Language.LL( Apply, FilesInfoTitle, 'FilesInfoTitle', 'Open Files Information' );
    1483   Language.LL( Apply, FilesInfoOverallTitle, 'FilesInfoOverallTitle', 'Title: ' );
    1484   Language.LL( Apply, FilesInfoFilename, 'FilesInfoFilename', 'Filename: ' );
    1485   Language.LL( Apply, FilesInfoFileTitle, 'FilesInfoFileTitle', '  Title: ' );
    1486   Language.LL( Apply, FilesInfoTopicCount, 'FilesInfoTopicCount', '  Topic Count: ' );
    1487   Language.LL( Apply, FilesInfoIndexCount, 'FilesInfoIndexCount', '  Index Count: ' );
    1488   Language.LL( Apply, FilesInfoDictionaryCount, 'FilesInfoDictionaryCount', '  Dictionary Count: ' );
    1489   Language.LL( Apply, FilesInfoFileSize, 'FilesInfoFileSize', '  Size: ' );
    1490   Language.LL( Apply, FilesInfoTotalTopicCount, 'FilesInfoTotalTopicCount', 'Total Topic Count: ' );
    1491   Language.LL( Apply, FilesInfoTotalIndexCount, 'FilesInfoTotalIndexCount', 'Total Index Count: ' );
    1492   Language.LL( Apply, FilesInfoTotalFileSize, 'FilesInfoTotalFileSize', 'Total File Size: ' );
    1493 
    1494   Language.LL( Apply, SearchTitle, 'SearchTitle', 'Search' );
    1495   Language.LL( Apply, SearchSyntaxError, 'SearchSyntaxError', 'Error in search syntax: ' );
    1496   Language.LL( Apply, SearchingMsg, 'SearchingMsg', 'Searching...' );
    1497   Language.LL( Apply, NoSearchMatchesMsg, 'NoSearchMatchesMsg', 'No matches found for ' );
    1498   Language.LL( Apply, SearchFoundMsgA, 'SearchFoundMsgA', 'Found ' );
    1499   Language.LL( Apply, SearchFoundMsgB, 'SearchFoundMsgB', ' matches for ' );
    1500 
    1501   Language.LL( Apply, FileSaveTitle, 'FileSaveTitle', 'Save Topic' );
    1502   Language.LL( Apply, FileSaveSelectWindowError, 'FileSaveSelectWindowError', 'Before saving, click in the window you want to save.' );
    1503   Language.LL( Apply, DefaultSaveTopicFilename, 'DefaultSaveTopicFilename', 'topic.txt' );
    1504 
    1505   Language.LL( Apply, ReplaceFilePromptA, 'ReplaceFilePromptA', 'Replace existing file ' );
    1506   Language.LL( Apply, ReplaceFilePromptB, 'ReplaceFilePromptB', '?' );
    1507   Language.LL( Apply, UnableToSaveError, 'UnableToSaveError', 'Unable to save file: ' );
    1508 
    1509   Language.LL( Apply, UsageTitle, 'UsageTitle', 'NewView Command Line' );
    1510   Language.LL( Apply, UsageText1, 'UsageText1', 'Usage: ' );
    1511   Language.LL( Apply, UsageText2, 'UsageText2', 'NewView <filename> [<topic>]' );
    1512   Language.LL( Apply, UsageText3, 'UsageText3', ' /s Do search for <topic>' );
    1513   Language.LL( Apply, UsageText4, 'UsageText4', ' /g Do global search for <topic>' );
    1514   Language.LL( Apply, UsageText5, 'UsageText5', ' /pos:l,b,w,h Set window position' );
    1515   Language.LL( Apply, UsageText6, 'UsageText6', ' /lang:<lang> Load UI language' );
    1516   Language.LL( Apply, UsageText7, 'UsageText7', ' /title:<title> Set window title' );
    1517   Language.LL( Apply, UsageText8, 'UsageText8', 'See help for details' );
    1518 
    1519   Language.LL( Apply, GoBackHint, 'GoBackHint', 'Go back to ' );
    1520 
    1521   Language.LL( Apply, SelectAllTitle, 'SelectAllTitle', 'Select All' );
    1522   Language.LL( Apply, SelectAllWindowError, 'SelectAllWindowError', 'Click in a text window first' );
    1523 
    1524   Language.LL( Apply, EditNoteMsg, 'EditNoteMsg', 'Click to edit note' );
    1525   Language.LL( Apply, ExternalLinkMsg, 'ExternalLinkMsg', 'Link to another file' );
    1526   Language.LL( Apply, LinkMsg, 'LinkMsg', 'Link to' );
    1527   Language.LL( Apply, UnknownLinkMsg, 'UnknownLinkMsg', 'Unknown link' );
    1528   Language.LL( Apply, FootnoteMsg, 'FootnoteMsg', 'Footnote' );
    1529 
    1530   Language.LL( Apply, ExternalLinkTitle, 'ExternalLinkTitle', 'File Link' );
    1531   Language.LL( Apply, ExternalLinkError, 'ExternalLinkError', 'Sorry, this is a link to another file, which is not currently implemented in NewView' );
    1532 
    1533   Language.LL( Apply, MRUMultipleFilesHint, 'MRUMultipleFilesHint', 'files' );
    1534   Language.LL( Apply, HelpProgramTitle, 'HelpProgramTitle', 'Help' );
    1535 
    1536   Language.LL( Apply, WindowsHelpTitle, 'WindowsHelpTitle', 'Windows Help' );
     1476  Language.LL( Apply, EnvironmentVarUndefined, tmpPrefix + 'EnvironmentVarUndefined', 'Undefined: ' );
     1477
     1478  Language.LL( Apply, FindTitle, tmpPrefix + 'FindTitle', 'Find' );
     1479  Language.LL( Apply, FindSelectWindowError, tmpPrefix + 'FindSelectWindowError', 'Click in a window first' );
     1480  Language.LL( Apply, FindPrompt, tmpPrefix + 'FindPrompt', 'Enter the text to find' );
     1481  Language.LL( Apply, TextNotFoundMsg, tmpPrefix + 'TextNotFoundMsg', 'Text not found' );
     1482
     1483  Language.LL( Apply, FilesInfoTitle, tmpPrefix + 'FilesInfoTitle', 'Open Files Information' );
     1484  Language.LL( Apply, FilesInfoOverallTitle, tmpPrefix + 'FilesInfoOverallTitle', 'Title: ' );
     1485  Language.LL( Apply, FilesInfoFilename, tmpPrefix + 'FilesInfoFilename', 'Filename: ' );
     1486  Language.LL( Apply, FilesInfoFileTitle, tmpPrefix + 'FilesInfoFileTitle', '  Title: ' );
     1487  Language.LL( Apply, FilesInfoTopicCount, tmpPrefix + 'FilesInfoTopicCount', '  Topic Count: ' );
     1488  Language.LL( Apply, FilesInfoIndexCount, tmpPrefix + 'FilesInfoIndexCount', '  Index Count: ' );
     1489  Language.LL( Apply, FilesInfoDictionaryCount, tmpPrefix + 'FilesInfoDictionaryCount', '  Dictionary Count: ' );
     1490  Language.LL( Apply, FilesInfoFileSize, tmpPrefix + 'FilesInfoFileSize', '  Size: ' );
     1491  Language.LL( Apply, FilesInfoTotalTopicCount, tmpPrefix + 'FilesInfoTotalTopicCount', 'Total Topic Count: ' );
     1492  Language.LL( Apply, FilesInfoTotalIndexCount, tmpPrefix + 'FilesInfoTotalIndexCount', 'Total Index Count: ' );
     1493  Language.LL( Apply, FilesInfoTotalFileSize, tmpPrefix + 'FilesInfoTotalFileSize', 'Total File Size: ' );
     1494
     1495  Language.LL( Apply, SearchTitle, tmpPrefix + 'SearchTitle', 'Search' );
     1496  Language.LL( Apply, SearchSyntaxError, tmpPrefix + 'SearchSyntaxError', 'Error in search syntax: ' );
     1497  Language.LL( Apply, SearchingMsg, tmpPrefix + 'SearchingMsg', 'Searching...' );
     1498  Language.LL( Apply, NoSearchMatchesMsg, tmpPrefix + 'NoSearchMatchesMsg', 'No matches found for ' );
     1499  Language.LL( Apply, SearchFoundMsgA, tmpPrefix + 'SearchFoundMsgA', 'Found ' );
     1500  Language.LL( Apply, SearchFoundMsgB, tmpPrefix + 'SearchFoundMsgB', ' matches for ' );
     1501
     1502  Language.LL( Apply, FileSaveTitle, tmpPrefix + 'FileSaveTitle', 'Save Topic' );
     1503  Language.LL( Apply, FileSaveSelectWindowError, tmpPrefix + 'FileSaveSelectWindowError', 'Before saving, click in the window you want to save.' );
     1504  Language.LL( Apply, DefaultSaveTopicFilename, tmpPrefix + 'DefaultSaveTopicFilename', 'topic.txt' );
     1505
     1506  Language.LL( Apply, ReplaceFilePromptA, tmpPrefix + 'ReplaceFilePromptA', 'Replace existing file ' );
     1507  Language.LL( Apply, ReplaceFilePromptB, tmpPrefix + 'ReplaceFilePromptB', '?' );
     1508  Language.LL( Apply, UnableToSaveError, tmpPrefix + 'UnableToSaveError', 'Unable to save file: ' );
     1509
     1510  Language.LL( Apply, UsageTitle, tmpPrefix + 'UsageTitle', 'NewView Command Line' );
     1511  Language.LL( Apply, UsageText1, tmpPrefix + 'UsageText1', 'Usage: ' );
     1512  Language.LL( Apply, UsageText2, tmpPrefix + 'UsageText2', 'NewView <filename> [<topic>]' );
     1513  Language.LL( Apply, UsageText3, tmpPrefix + 'UsageText3', ' /s Do search for <topic>' );
     1514  Language.LL( Apply, UsageText4, tmpPrefix + 'UsageText4', ' /g Do global search for <topic>' );
     1515  Language.LL( Apply, UsageText5, tmpPrefix + 'UsageText5', ' /pos:l,b,w,h Set window position' );
     1516  Language.LL( Apply, UsageText6, tmpPrefix + 'UsageText6', ' /lang:<lang> Load UI language' );
     1517  Language.LL( Apply, UsageText7, tmpPrefix + 'UsageText7', ' /title:<title> Set window title' );
     1518  Language.LL( Apply, UsageText8, tmpPrefix + 'UsageText8', 'See help for details' );
     1519
     1520  Language.LL( Apply, GoBackHint, tmpPrefix + 'GoBackHint', 'Go back to ' );
     1521
     1522  Language.LL( Apply, SelectAllTitle, tmpPrefix + 'SelectAllTitle', 'Select All' );
     1523  Language.LL( Apply, SelectAllWindowError, tmpPrefix + 'SelectAllWindowError', 'Click in a text window first' );
     1524
     1525  Language.LL( Apply, EditNoteMsg, tmpPrefix + 'EditNoteMsg', 'Click to edit note' );
     1526  Language.LL( Apply, ExternalLinkMsg, tmpPrefix + 'ExternalLinkMsg', 'Link to another file' );
     1527  Language.LL( Apply, LinkMsg, tmpPrefix + 'LinkMsg', 'Link to' );
     1528  Language.LL( Apply, UnknownLinkMsg, tmpPrefix + 'UnknownLinkMsg', 'Unknown link' );
     1529  Language.LL( Apply, FootnoteMsg, tmpPrefix + 'FootnoteMsg', 'Footnote' );
     1530
     1531  Language.LL( Apply, ExternalLinkTitle, tmpPrefix + 'ExternalLinkTitle', 'File Link' );
     1532  Language.LL( Apply, ExternalLinkError, tmpPrefix + 'ExternalLinkError', 'Sorry, this is a link to another file, which is not currently implemented in NewView' );
     1533
     1534  Language.LL( Apply, MRUMultipleFilesHint, tmpPrefix + 'MRUMultipleFilesHint', 'files' );
     1535  Language.LL( Apply, HelpProgramTitle, tmpPrefix + 'HelpProgramTitle', 'Help' );
     1536
     1537  Language.LL( Apply, WindowsHelpTitle, tmpPrefix + 'WindowsHelpTitle', 'Windows Help' );
     1538// TODO
    15371539  Language.LL( Apply,
    15381540               WindowsHelpPrompt,
    1539                'WindowsHelpPrompt',
     1541               tmpPrefix + 'WindowsHelpPrompt',
    15401542               'This file is a Windows help file. '
    15411543               + 'Would you like to start Windows Help viewer?' );
    15421544
    1543   Language.LL( Apply, ErrorTitle, 'ErrorTitle', 'Error' );
    1544 
    1545   Language.LL( Apply, FindTopicNameTitle, 'FindTopicNameTitle', 'Find Topic By Name' );
    1546   Language.LL( Apply, FindTopicNamePrompt, 'FindTopicNamePrompt', 'Enter the topic name to search for' );
    1547   Language.LL( Apply, TopicNameNotFoundError, 'TopicNameNotFoundError', 'Topic name not found' );
    1548   Language.LL( Apply, SplitBarDblClickToShow, 'SplitBarDblClickToShow', 'Double-click to show left panel' );
    1549   Language.LL( Apply, SplitBarDblClickToHide, 'SplitBarDblClickToHide', 'Double-click to hide left panel' );
     1545  Language.LL( Apply, ErrorTitle, tmpPrefix + 'ErrorTitle', 'Error' );
     1546
     1547  Language.LL( Apply, FindTopicNameTitle, tmpPrefix + 'FindTopicNameTitle', 'Find Topic By Name' );
     1548  Language.LL( Apply, FindTopicNamePrompt, tmpPrefix + 'FindTopicNamePrompt', 'Enter the topic name to search for' );
     1549  Language.LL( Apply, TopicNameNotFoundError, tmpPrefix + 'TopicNameNotFoundError', 'Topic name not found' );
     1550  Language.LL( Apply, SplitBarDblClickToShow, tmpPrefix + 'SplitBarDblClickToShow', 'Double-click to show left panel' );
     1551  Language.LL( Apply, SplitBarDblClickToHide, tmpPrefix + 'SplitBarDblClickToHide', 'Double-click to hide left panel' );
    15501552
    15511553  SetMainCaption;
    … …  
    15761578Procedure TMainForm.DebugSaveLanguageFileMIOnClick (Sender: TObject);
    15771579Var
    1578   LanguageFile: TLanguageFile;
     1580  // LanguageFile: TLanguageFile;
    15791581  Dir: string;
    15801582  Filename: string;
    … …  
    15961598
    15971599  try
    1598     LanguageFile := TLanguageFile.Create( Filename );
    1599 
    1600     UpdateLanguage( LanguageFile );
     1600    // first touch all
     1601    UpdateLanguage(g_CurrentLanguageFile);
     1602    // then save
     1603    g_CurrentLanguageFile.writeToFile(Filename);
    16011604  except
    16021605    on E: Exception do
    … …  
    16071610    end;
    16081611  end;
    1609 
    1610   LanguageFile.Destroy;
    1611 
     1612 
    16121613  CreateMRUMenuItems;
    16131614End;
    … …  
    38293830  Application.OnHelp := OnHelp;
    38303831
    3831   RegisterForLanguages( OnLanguageEvent );
     3832  RegisterEventForLanguages( OnLanguageEvent );
    38323833
    38333834  // if debug is not enabled, get rid of the debug menu and separator.
    … …  
    39143915    if CmdLineParameters.getLanguage <> '' then
    39153916    begin
    3916       if not LoadAutoLanguage('newview', CmdLineParameters.getLanguage) then
     3917      if not LoadLanguageForSpec('newview', CmdLineParameters.getLanguage) then
    39173918      begin
    39183919        LoadDefaultLanguage('newview');

  • trunk/NewView/NewView.spr

    r209 r228  
    4848File29=INIFILES
    4949File30=ACLUTILITY
    50 File31=ACLSTRINGUTILITY
    51 File32=ACLFILEIOUTILITY
    52 File33=CHARUTILSUNIT
    53 File34=ACLSTRING
    54 File35=SEMAPHORES
    55 File36=SHAREDMEMORYUNIT
    56 File37=COOLBAR2
    57 File38=CUSTOMHEADERCONTROL
    58 File39=MULTICOLUMNLISTBOX
    59 File40=BSEDEV
    60 File41=DEBUGUNIT
    61 File42=STRINGUTILSUNIT
    62 File43=FILEUTILSUNIT
    63 File44=ACLLANGUAGEUNIT
    64 File45=GENERICTHREAD
    65 File46=VERSIONUNIT
    66 File47=CMDLINEPARAMETERUNIT
    67 File48=SPLITBAR
    68 File49=CONTROLSCROLLING
    69 File50=OUTLINE2
    70 File51=CANVASFONTMANAGER
    71 File52=RICHTEXTDOCUMENTUNIT
    72 File53=RICHTEXTSTYLEUNIT
    73 File54=CLIPBRD
    74 File55=RICHTEXTLAYOUTUNIT
    75 File56=CONTROLSUTILITY
    76 File57=RICHTEXTDISPLAYUNIT
    77 File58=RICHTEXTVIEW
    78 File59=CUSTOMLISTBOX
    79 File60=IPFFILEFORMATUNIT
    80 File61=HELPWINDOWDIMENSIONS
    81 File62=NEWVIEWCONSTANTSUNIT
    82 File63=ASTRINGUTILITYUNIT
    83 File64=SETTINGSUNIT
    84 File65=HELPTOPIC
    85 File66=CUSTOMMEMO
    86 File67=SYSTEMICONUNIT
    87 File68=ACLMESSAGEFORM
    88 File69=ACLDIALOGS
    89 File70=HELPBITMAP
    90 File71=SEARCHTABLE
    91 File72=HELPFILE
    92 File73=HELPWINDOWUNIT
    93 File74=NAVIGATEPOINTUNIT
    94 File75=MISCUNIT
    95 File76=HELPMANAGERUNIT
    96 File77=TEXTSEARCHQUERY
    97 File78=TABSET2UNIT
    98 File79=RUNPROGRAMUNIT
    99 File80=RICHTEXTPRINTUNIT
    100 File81=INFORMATIONFORMUNIT
    101 File82=COLORMAPPING
    102 File83=COLORWHEEL
    103 File84=CUSTOMFONTDIALOG
    104 File85=BITMAPUTILITY
    105 File86=CUSTOMFILECONTROLS
    106 File87=FILEDIALOGFORM
    107 File88=OPTIONSFORM
    108 File89=WEBBROWSERUNIT
    109 File90=PRODUCTINFORMATIONFORMUNIT
    110 File91=NOTEFORM
    111 File92=LED
    112 File93=SEARCHUNIT
    113 File94=SEARCHDIRECTORIESFORMUNIT
    114 File95=GLOBALSEARCHFORM
    115 File96=BOOKMARKSFORMUNIT
    116 File97=PRINTDIALOGUNIT
    117 File98=GLOBALFILELISTUNIT
    118 File99=STARTUPUNIT
    119 File100=MAINFORM
     50File31=CHARUTILSUNIT
     51File32=DEBUGUNIT
     52File33=STRINGUTILSUNIT
     53File34=ACLFILEIOUTILITY
     54File35=ACLSTRING
     55File36=SEMAPHORES
     56File37=SHAREDMEMORYUNIT
     57File38=BSEDEV
     58File39=FILEUTILSUNIT
     59File40=COOLBAR2
     60File41=CUSTOMHEADERCONTROL
     61File42=MULTICOLUMNLISTBOX
     62File43=ACLLANGUAGEUNIT
     63File44=GENERICTHREAD
     64File45=VERSIONUNIT
     65File46=CMDLINEPARAMETERUNIT
     66File47=SPLITBAR
     67File48=CONTROLSCROLLING
     68File49=OUTLINE2
     69File50=CANVASFONTMANAGER
     70File51=RICHTEXTDOCUMENTUNIT
     71File52=RICHTEXTSTYLEUNIT
     72File53=CLIPBRD
     73File54=RICHTEXTLAYOUTUNIT
     74File55=CONTROLSUTILITY
     75File56=RICHTEXTDISPLAYUNIT
     76File57=RICHTEXTVIEW
     77File58=CUSTOMLISTBOX
     78File59=IPFFILEFORMATUNIT
     79File60=HELPWINDOWDIMENSIONS
     80File61=NEWVIEWCONSTANTSUNIT
     81File62=ASTRINGUTILITYUNIT
     82File63=SETTINGSUNIT
     83File64=HELPTOPIC
     84File65=CUSTOMMEMO
     85File66=SYSTEMICONUNIT
     86File67=ACLMESSAGEFORM
     87File68=ACLDIALOGS
     88File69=HELPBITMAP
     89File70=SEARCHTABLE
     90File71=HELPFILE
     91File72=HELPWINDOWUNIT
     92File73=NAVIGATEPOINTUNIT
     93File74=MISCUNIT
     94File75=HELPMANAGERUNIT
     95File76=TEXTSEARCHQUERY
     96File77=TABSET2UNIT
     97File78=RUNPROGRAMUNIT
     98File79=RICHTEXTPRINTUNIT
     99File80=INFORMATIONFORMUNIT
     100File81=COLORMAPPING
     101File82=COLORWHEEL
     102File83=CUSTOMFONTDIALOG
     103File84=BITMAPUTILITY
     104File85=CUSTOMFILECONTROLS
     105File86=FILEDIALOGFORM
     106File87=OPTIONSFORM
     107File88=WEBBROWSERUNIT
     108File89=PRODUCTINFORMATIONFORMUNIT
     109File90=NOTEFORM
     110File91=LED
     111File92=SEARCHUNIT
     112File93=SEARCHDIRECTORIESFORMUNIT
     113File94=GLOBALSEARCHFORM
     114File95=BOOKMARKSFORMUNIT
     115File96=PRINTDIALOGUNIT
     116File97=GLOBALFILELISTUNIT
     117File98=STARTUPUNIT
     118File99=MAINFORM
    120119
    121120[Compiler Options]
    … …  
    165164[Find History]
    166165
    167 Find0=getdrivetype
    168 Find1=Unit
    169 Find2=ExtractNextValue
    170 Find3=StrLeft
    171 Find4=PCharPointerDiff
    172 Find5=PCharDiff
    173 Find6=beta1
    174 Find7=Filename
    175 Find8=FilesInfoFilename
    176 Find9=FindTopicByGlobalName
    177 Find10=Unable to find topic with global name
    178 Find11=GetNextQuotedValue
    179 Find12=pValue
    180 Find13=Used
    181 Find14=LoadL
    182 Find15=startupdate
     166Find0=OpenWindowsHelp
     167Find1=WINDOWSHELPPROMPT
     168Find2=TLanguageItemList.get
     169Find3=TlanguageItemList
     170Find4=LoadLanguage
     171Find5=DebugLoadLanguageMIOnClick
     172Find6=loadlang
     173Find7=ApplyLanguage
     174Find8=updatelang
     175Find9=updatel
     176Find10=open
     177Find11=RegisterUpdateProcForLanguages
     178Find12=g_LanguageUpdateCallbacks
     179Find13=writeToFile
     180Find14=saveTo
     181Find15=debugfind
    183182
    184183[General]
    185184
    186185Version=Sibyl Project Ver2.02
    187 ProjectName=P:\NEWVIEW_DEV\NEWVIEW\NewView.spr
     186ProjectName=P:\NEWVIEW_DEV\NewView\NewView.spr
    188187ProjectType=Visual
    189188CompLibName=D:\progs\Sibyl\Bin\CompLib.dll
    190189Win32CompLibName=D:\progs\Sibyl\Bin\CompLib.dll
    191 RunParameter=-lang:en
     190RunParameter=-lang:de
    192191InActiveLanguages=
    193192CurrentLanguage=Default
    … …  
    196195[Last Closed Files]
    197196
    198 File0=..\.\Components\Outline2.PAS
    199 File1=..\.\library\DebugUnit.pas
    200 File2=.\SettingsUnit.pas
    201 File3=..\.\Components\RichTextDisplayUnit.pas
     197File0=.\FileDialogForm.pas
     198File1=.\GlobalSearchForm.pas
     199File2=.\InformationFormUnit.pas
     200File3=.\NoteForm.pas
     201File4=.\PrintDialogUnit.pas
     202File5=.\ProductInformationFormUnit.pas
    202203
    203204[Last Open Files]
    204205
    205 File0=.\MainForm.pas
     206File0=.\VersionUnit.pas
    206207File0.Left=-4
    207 File0.Bottom=-5
    208 File0.Width=1399
     208File0.Bottom=-4
     209File0.Width=1296
    209210File0.Height=629
    210 File0.Column=29
    211 File0.Line=5524
    212 File1=.\VersionUnit.pas
     211File0.Column=57
     212File0.Line=11
     213File1=.\NewView.pas
    213214File1.Left=-4
    214 File1.Bottom=-5
    215 File1.Width=1399
     215File1.Bottom=-4
     216File1.Width=1296
    216217File1.Height=629
    217 File1.Column=32
    218 File1.Line=18
     218File1.Column=31
     219File1.Line=24
    219220File2=..\.\Components\ACLLanguageUnit.pas
    220221File2.Left=-4
    221 File2.Bottom=-5
    222 File2.Width=1399
     222File2.Bottom=-4
     223File2.Width=1296
    223224File2.Height=629
    224 File2.Column=44
    225 File2.Line=526
    226 File3=.\NewView.pas
     225File2.Column=28
     226File2.Line=626
     227File3=.\MainForm.pas
    227228File3.Left=-4
    228 File3.Bottom=-5
    229 File3.Width=1399
     229File3.Bottom=-4
     230File3.Width=1296
    230231File3.Height=629
    231 File3.Column=3
    232 File3.Line=13
    233 File4=.\CmdLineParameterUnit.pas
     232File3.Column=35
     233File3.Line=6483
     234File4=.\HelpTopic.pas
    234235File4.Left=-4
    235 File4.Bottom=-5
    236 File4.Width=1399
     236File4.Bottom=-4
     237File4.Width=1296
    237238File4.Height=629
    238 File4.Column=3
    239 File4.Line=19
    240 File5=..\.\Library\ACLString.pas
     239File4.Column=1
     240File4.Line=2744
     241File5=.\HelpFile.pas
    241242File5.Left=-4
    242 File5.Bottom=-5
    243 File5.Width=1399
     243File5.Bottom=-4
     244File5.Width=1296
    244245File5.Height=629
    245 File5.Column=3
    246 File5.Line=182
    247 File6=..\.\Library\ACLStringUtility.pas
    248 File6.Left=-4
    249 File6.Bottom=-5
    250 File6.Width=1399
    251 File6.Height=629
    252 File6.Column=3
    253 File6.Line=291
    254 File7=..\.\Library\CharUtilsUnit.pas
    255 File7.Left=-4
    256 File7.Bottom=-5
    257 File7.Width=1399
    258 File7.Height=629
    259 File7.Column=17
    260 File7.Line=54
    261 File8=..\.\Library\StringUtilsUnit.pas
    262 File8.Left=-4
    263 File8.Bottom=-5
    264 File8.Width=1399
    265 File8.Height=629
    266 File8.Column=76
    267 File8.Line=435
    268 File9=..\.\Library\ACLFileIOUtility.pas
    269 File9.Left=-4
    270 File9.Bottom=-5
    271 File9.Width=1399
    272 File9.Height=629
    273 File9.Column=1
    274 File9.Line=1
    275 File10=..\.\Library\ACLUtility.pas
    276 File10.Left=-4
    277 File10.Bottom=-5
    278 File10.Width=1399
    279 File10.Height=629
    280 File10.Column=1
    281 File10.Line=1
    282 File11=.\GlobalSearchForm.pas
    283 File11.Left=-4
    284 File11.Bottom=-5
    285 File11.Width=1399
    286 File11.Height=629
    287 File11.Column=1
    288 File11.Line=753
    289 File12=..\.\library\SharedMemoryUnit.pas
    290 File12.Left=-4
    291 File12.Bottom=-5
    292 File12.Width=1399
    293 File12.Height=629
    294 File12.Column=3
    295 File12.Line=7
    296 File13=..\.\library\Semaphores.pas
    297 File13.Left=-4
    298 File13.Bottom=-5
    299 File13.Width=1399
    300 File13.Height=629
    301 File13.Column=1
    302 File13.Line=1
    303 File14=..\.\library\RunProgramUnit.pas
    304 File14.Left=-4
    305 File14.Bottom=-5
    306 File14.Width=1399
    307 File14.Height=629
    308 File14.Column=1
    309 File14.Line=1
    310 File15=.\HelpTopic.pas
    311 File15.Left=-4
    312 File15.Bottom=-5
    313 File15.Width=1399
    314 File15.Height=629
    315 File15.Column=3
    316 File15.Line=256
    317 File16=..\.\library\AStringUtilityUnit.pas
    318 File16.Left=-4
    319 File16.Bottom=-5
    320 File16.Width=1399
    321 File16.Height=629
    322 File16.Column=1
    323 File16.Line=1
    324 File17=.\SearchDirectoriesFormUnit.pas
    325 File17.Left=-4
    326 File17.Bottom=-5
    327 File17.Width=1399
    328 File17.Height=629
    329 File17.Column=64
    330 File17.Line=63
     246File5.Column=37
     247File5.Line=1063
    331248
    332249[Linker Options]
    … …  
    349266MainFile0=.\NewView.pas
    350267MainFile0.Ext=.EXE
    351 MainFile0.Checksum=26368
     268MainFile0.Checksum=26112
    352269MainFile0.Expanded=False
    353270MainFile0.File0=.\BookmarksFormUnit.pas
    … …  
    411328MainFile0.Dependency29=..\.\sibyl\spcc\INIFILES.PAS
    412329MainFile0.Dependency30=..\.\library\ACLUTILITY.PAS
    413 MainFile0.Dependency31=..\.\library\ACLSTRINGUTILITY.PAS
    414 MainFile0.Dependency32=..\.\library\ACLFILEIOUTILITY.PAS
    415 MainFile0.Dependency33=..\.\library\CHARUTILSUNIT.PAS
    416 MainFile0.Dependency34=..\.\library\ACLSTRING.PAS
    417 MainFile0.Dependency35=..\.\library\SEMAPHORES.PAS
    418 MainFile0.Dependency36=..\.\library\SHAREDMEMORYUNIT.PAS
    419 MainFile0.Dependency37=..\.\components\COOLBAR2.PAS
    420 MainFile0.Dependency38=..\.\components\CUSTOMHEADERCONTROL.PAS
    421 MainFile0.Dependency39=..\.\components\MULTICOLUMNLISTBOX.PAS
    422 MainFile0.Dependency40=..\.\sibyl\rtl\BSEDEV.PAS
    423 MainFile0.Dependency41=..\.\library\DEBUGUNIT.PAS
    424 MainFile0.Dependency42=..\.\library\STRINGUTILSUNIT.PAS
    425 MainFile0.Dependency43=..\.\library\FILEUTILSUNIT.PAS
    426 MainFile0.Dependency44=..\.\components\ACLLANGUAGEUNIT.PAS
    427 MainFile0.Dependency45=..\.\components\GENERICTHREAD.PAS
    428 MainFile0.Dependency46=.\VERSIONUNIT.PAS
    429 MainFile0.Dependency47=.\CMDLINEPARAMETERUNIT.PAS
    430 MainFile0.Dependency48=..\.\components\SPLITBAR.PAS
    431 MainFile0.Dependency49=..\.\components\CONTROLSCROLLING.PAS
    432 MainFile0.Dependency50=..\.\components\OUTLINE2.PAS
    433 MainFile0.Dependency51=..\.\components\CANVASFONTMANAGER.PAS
    434 MainFile0.Dependency52=..\.\components\RICHTEXTDOCUMENTUNIT.PAS
    435 MainFile0.Dependency53=..\.\components\RICHTEXTSTYLEUNIT.PAS
    436 MainFile0.Dependency54=..\.\sibyl\spcc\CLIPBRD.PAS
    437 MainFile0.Dependency55=..\.\components\RICHTEXTLAYOUTUNIT.PAS
    438 MainFile0.Dependency56=..\.\components\CONTROLSUTILITY.PAS
    439 MainFile0.Dependency57=..\.\components\RICHTEXTDISPLAYUNIT.PAS
    440 MainFile0.Dependency58=..\.\components\RICHTEXTVIEW.PAS
    441 MainFile0.Dependency59=..\.\components\CUSTOMLISTBOX.PAS
    442 MainFile0.Dependency60=.\IPFFILEFORMATUNIT.PAS
    443 MainFile0.Dependency61=.\HELPWINDOWDIMENSIONS.PAS
    444 MainFile0.Dependency62=.\NEWVIEWCONSTANTSUNIT.PAS
    445 MainFile0.Dependency63=..\.\library\ASTRINGUTILITYUNIT.PAS
    446 MainFile0.Dependency64=.\SETTINGSUNIT.PAS
    447 MainFile0.Dependency65=.\HELPTOPIC.PAS
    448 MainFile0.Dependency66=..\.\components\CUSTOMMEMO.PAS
    449 MainFile0.Dependency67=..\.\components\SYSTEMICONUNIT.PAS
    450 MainFile0.Dependency68=..\.\components\ACLMESSAGEFORM.PAS
    451 MainFile0.Dependency69=..\.\components\ACLDIALOGS.PAS
    452 MainFile0.Dependency70=.\HELPBITMAP.PAS
    453 MainFile0.Dependency71=.\SEARCHTABLE.PAS
    454 MainFile0.Dependency72=.\HELPFILE.PAS
    455 MainFile0.Dependency73=.\HELPWINDOWUNIT.PAS
    456 MainFile0.Dependency74=.\NAVIGATEPOINTUNIT.PAS
    457 MainFile0.Dependency75=.\MISCUNIT.PAS
    458 MainFile0.Dependency76=.\HELPMANAGERUNIT.PAS
    459 MainFile0.Dependency77=.\TEXTSEARCHQUERY.PAS
    460 MainFile0.Dependency78=..\.\components\TABSET2UNIT.PAS
    461 MainFile0.Dependency79=..\.\library\RUNPROGRAMUNIT.PAS
    462 MainFile0.Dependency80=..\.\components\RICHTEXTPRINTUNIT.PAS
    463 MainFile0.Dependency81=.\INFORMATIONFORMUNIT.PAS
    464 MainFile0.Dependency82=..\.\components\COLORMAPPING.PAS
    465 MainFile0.Dependency83=..\.\components\COLORWHEEL.PAS
    466 MainFile0.Dependency84=..\.\components\CUSTOMFONTDIALOG.PAS
    467 MainFile0.Dependency85=..\.\components\BITMAPUTILITY.PAS
    468 MainFile0.Dependency86=..\.\components\CUSTOMFILECONTROLS.PAS
    469 MainFile0.Dependency87=.\FILEDIALOGFORM.PAS
    470 MainFile0.Dependency88=.\OPTIONSFORM.PAS
    471 MainFile0.Dependency89=.\WEBBROWSERUNIT.PAS
    472 MainFile0.Dependency90=.\PRODUCTINFORMATIONFORMUNIT.PAS
    473 MainFile0.Dependency91=.\NOTEFORM.PAS
    474 MainFile0.Dependency92=.\SEARCHUNIT.PAS
    475 MainFile0.Dependency93=.\SEARCHDIRECTORIESFORMUNIT.PAS
    476 MainFile0.Dependency94=.\GLOBALSEARCHFORM.PAS
    477 MainFile0.Dependency95=.\BOOKMARKSFORMUNIT.PAS
    478 MainFile0.Dependency96=.\PRINTDIALOGUNIT.PAS
    479 MainFile0.Dependency97=.\GLOBALFILELISTUNIT.PAS
    480 MainFile0.Dependency98=.\STARTUPUNIT.PAS
    481 MainFile0.Dependency99=.\MAINFORM.PAS
    482 MainFile0.Dependency100=.\NewView.scu
     330MainFile0.Dependency31=..\.\library\CHARUTILSUNIT.PAS
     331MainFile0.Dependency32=..\.\library\DEBUGUNIT.PAS
     332MainFile0.Dependency33=..\.\library\STRINGUTILSUNIT.PAS
     333MainFile0.Dependency34=..\.\library\ACLFILEIOUTILITY.PAS
     334MainFile0.Dependency35=..\.\library\ACLSTRING.PAS
     335MainFile0.Dependency36=..\.\library\SEMAPHORES.PAS
     336MainFile0.Dependency37=..\.\library\SHAREDMEMORYUNIT.PAS
     337MainFile0.Dependency38=..\.\sibyl\rtl\BSEDEV.PAS
     338MainFile0.Dependency39=..\.\library\FILEUTILSUNIT.PAS
     339MainFile0.Dependency40=..\.\components\COOLBAR2.PAS
     340MainFile0.Dependency41=..\.\components\CUSTOMHEADERCONTROL.PAS
     341MainFile0.Dependency42=..\.\components\MULTICOLUMNLISTBOX.PAS
     342MainFile0.Dependency43=..\.\components\ACLLANGUAGEUNIT.PAS
     343MainFile0.Dependency44=..\.\components\GENERICTHREAD.PAS
     344MainFile0.Dependency45=.\VERSIONUNIT.PAS
     345MainFile0.Dependency46=.\CMDLINEPARAMETERUNIT.PAS
     346MainFile0.Dependency47=..\.\components\SPLITBAR.PAS
     347MainFile0.Dependency48=..\.\components\CONTROLSCROLLING.PAS
     348MainFile0.Dependency49=..\.\components\OUTLINE2.PAS
     349MainFile0.Dependency50=..\.\components\CANVASFONTMANAGER.PAS
     350MainFile0.Dependency51=..\.\components\RICHTEXTDOCUMENTUNIT.PAS
     351MainFile0.Dependency52=..\.\components\RICHTEXTSTYLEUNIT.PAS
     352MainFile0.Dependency53=..\.\sibyl\spcc\CLIPBRD.PAS
     353MainFile0.Dependency54=..\.\components\RICHTEXTLAYOUTUNIT.PAS
     354MainFile0.Dependency55=..\.\components\CONTROLSUTILITY.PAS
     355MainFile0.Dependency56=..\.\components\RICHTEXTDISPLAYUNIT.PAS
     356MainFile0.Dependency57=..\.\components\RICHTEXTVIEW.PAS
     357MainFile0.Dependency58=..\.\components\CUSTOMLISTBOX.PAS
     358MainFile0.Dependency59=.\IPFFILEFORMATUNIT.PAS
     359MainFile0.Dependency60=.\HELPWINDOWDIMENSIONS.PAS
     360MainFile0.Dependency61=.\NEWVIEWCONSTANTSUNIT.PAS
     361MainFile0.Dependency62=..\.\library\ASTRINGUTILITYUNIT.PAS
     362MainFile0.Dependency63=.\SETTINGSUNIT.PAS
     363MainFile0.Dependency64=.\HELPTOPIC.PAS
     364MainFile0.Dependency65=..\.\components\CUSTOMMEMO.PAS
     365MainFile0.Dependency66=..\.\components\SYSTEMICONUNIT.PAS
     366MainFile0.Dependency67=..\.\components\ACLMESSAGEFORM.PAS
     367MainFile0.Dependency68=..\.\components\ACLDIALOGS.PAS
     368MainFile0.Dependency69=.\HELPBITMAP.PAS
     369MainFile0.Dependency70=.\SEARCHTABLE.PAS
     370MainFile0.Dependency71=.\HELPFILE.PAS
     371MainFile0.Dependency72=.\HELPWINDOWUNIT.PAS
     372MainFile0.Dependency73=.\NAVIGATEPOINTUNIT.PAS
     373MainFile0.Dependency74=.\MISCUNIT.PAS
     374MainFile0.Dependency75=.\HELPMANAGERUNIT.PAS
     375MainFile0.Dependency76=.\TEXTSEARCHQUERY.PAS
     376MainFile0.Dependency77=..\.\components\TABSET2UNIT.PAS
     377MainFile0.Dependency78=..\.\library\RUNPROGRAMUNIT.PAS
     378MainFile0.Dependency79=..\.\components\RICHTEXTPRINTUNIT.PAS
     379MainFile0.Dependency80=.\INFORMATIONFORMUNIT.PAS
     380MainFile0.Dependency81=..\.\components\COLORMAPPING.PAS
     381MainFile0.Dependency82=..\.\components\COLORWHEEL.PAS
     382MainFile0.Dependency83=..\.\components\CUSTOMFONTDIALOG.PAS
     383MainFile0.Dependency84=..\.\components\BITMAPUTILITY.PAS
     384MainFile0.Dependency85=..\.\components\CUSTOMFILECONTROLS.PAS
     385MainFile0.Dependency86=.\FILEDIALOGFORM.PAS
     386MainFile0.Dependency87=.\OPTIONSFORM.PAS
     387MainFile0.Dependency88=.\WEBBROWSERUNIT.PAS
     388MainFile0.Dependency89=.\PRODUCTINFORMATIONFORMUNIT.PAS
     389MainFile0.Dependency90=.\NOTEFORM.PAS
     390MainFile0.Dependency91=.\SEARCHUNIT.PAS
     391MainFile0.Dependency92=.\SEARCHDIRECTORIESFORMUNIT.PAS
     392MainFile0.Dependency93=.\GLOBALSEARCHFORM.PAS
     393MainFile0.Dependency94=.\BOOKMARKSFORMUNIT.PAS
     394MainFile0.Dependency95=.\PRINTDIALOGUNIT.PAS
     395MainFile0.Dependency96=.\GLOBALFILELISTUNIT.PAS
     396MainFile0.Dependency97=.\STARTUPUNIT.PAS
     397MainFile0.Dependency98=.\MAINFORM.PAS
     398MainFile0.Dependency99=.\NewView.scu
    483399
    484400[Replace History]

  • trunk/NewView/NoteForm.pas

    r94 r228  
    5454                                     const Apply: boolean );
    5555begin
    56   LogEvent(LogI18n, 'TNoteForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
     56  // LogEvent(LogI18n, 'TNoteForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
    5757  Language.LoadComponentLanguage( self, Apply );
    5858end;
    … …  
    6565Procedure TNoteForm.NoteFormOnCreate (Sender: TObject);
    6666Begin
    67   RegisterForLanguages( OnLanguageEvent );
     67  RegisterEventForLanguages( OnLanguageEvent );
    6868
    6969  Text := TAString.Create;

  • trunk/NewView/OptionsForm.pas

    r94 r228  
    198198  i: longint;
    199199  ColorItemName: string;
     200  tmpPrefix : String;
    200201begin
    201   LogEvent(LogI18n, 'TOptionsForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
     202  // LogEvent(LogI18n, 'TOptionsForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
    202203  Language.LoadComponentLanguage( self, Apply );
    203204
    … …  
    208209  end;
    209210
     211  tmpPrefix := 'OptionsForm' + LANGUAGE_LABEL_DELIMITER;
     212
    210213  for i := 0 to NumColorSettings - 1 do
    211214  begin
    212215    Language.LL( Apply,
    213216                 ColorItemName,
    214                  'ColorItemName' + IntToStr( i ),
     217                 tmpPrefix + 'ColorItemName' + IntToStr( i ),
    215218                 DefaultColorItemNames[ i ] );
    216219    if Apply then
    … …  
    221224    ColorItemsListBox.EndUpdate;
    222225
    223   Language.LL( Apply, SelectBitmapTitle, 'SelectBitmapTitle', 'Select Bitmap File' );
    224   Language.LL( Apply, BitmapFilesDesc, 'BitmapFilesDesc', 'Bitmaps (*.bmp)' );
    225   Language.LL( Apply, BoldFontSuffix, 'BoldFontSuffix', ' Bold' );
    226   Language.LL( Apply, ItalicFontSuffix, 'ItalicFontSuffix', ' Italic' );
     226  Language.LL( Apply, SelectBitmapTitle, tmpPrefix + 'SelectBitmapTitle', 'Select Bitmap File' );
     227  Language.LL( Apply, BitmapFilesDesc, tmpPrefix + 'BitmapFilesDesc', 'Bitmaps (*.bmp)' );
     228  Language.LL( Apply, BoldFontSuffix, tmpPrefix + 'BoldFontSuffix', ' Bold' );
     229  Language.LL( Apply, ItalicFontSuffix, tmpPrefix + 'ItalicFontSuffix', ' Italic' );
    227230end;
    228231
    … …  
    358361Procedure TOptionsForm.OptionsFormOnCreate (Sender: TObject);
    359362Begin
    360   RegisterForLanguages( OnLanguageEvent );
     363  RegisterEventForLanguages( OnLanguageEvent );
    361364
    362365  TabbedNoteBook.ShowPageHint := false;

  • trunk/NewView/PrintDialogUnit.pas

    r94 r228  
    7070Procedure TNewViewPrintDialog.NewViewPrintDialogOnCreate (Sender: TObject);
    7171Begin
    72   RegisterForLanguages( OnLanguageEvent );
     72  RegisterEventForLanguages( OnLanguageEvent );
    7373End;
    7474
    7575Procedure TNewViewPrintDialog.OnLanguageEvent( Language: TLanguageFile;
    7676                                               const Apply: boolean );
     77var
     78  tmpPrefix : String;
    7779begin
    78   LogEvent(LogI18n, 'TNewViewPrintDialog.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
     80  // LogEvent(LogI18n, 'TNewViewPrintDialog.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
    7981  Language.LoadComponentLanguage( self, Apply );
    8082
    81   Language.LL( Apply, SetupPrinterErrorTitle, 'SetupPrinterErrorTitle', 'Setup Printer' );
    82   Language.LL( Apply, SetupPrinterError, 'SetupPrinterError', 'Error displaying printer options: ' );
     83  tmpPrefix := 'NewViewPrintDialog' + LANGUAGE_LABEL_DELIMITER;
     84
     85  Language.LL( Apply, SetupPrinterErrorTitle, tmpPrefix + 'SetupPrinterErrorTitle', 'Setup Printer' );
     86  Language.LL( Apply, SetupPrinterError, tmpPrefix + 'SetupPrinterError', 'Error displaying printer options: ' );
    8387end;
    8488

  • trunk/NewView/ProductInformationFormUnit.pas

    r94 r228  
    6767Procedure TProductInformationForm.OnLanguageEvent( Language: TLanguageFile;
    6868                                                   const Apply: boolean );
     69var
     70  tmpPrefix : String;
    6971begin
    70   LogEvent(LogI18n, 'TProductInformationForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
     72  // LogEvent(LogI18n, 'TProductInformationForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
    7173  Language.LoadComponentLanguage( self, Apply );
    7274
    73   Language.LL( Apply, VersionMsg, 'VersionMsg', 'Version: ' );
     75  tmpPrefix := 'ProductInformationForm' + LANGUAGE_LABEL_DELIMITER;
     76
     77  Language.LL( Apply, VersionMsg, tmpPrefix + 'VersionMsg', 'Version: ' );
    7478end;
    7579
    7680Procedure TProductInformationForm.AboutBoxOnCreate (Sender: TObject);
    7781Begin
    78   RegisterForLanguages( OnLanguageEvent );
     82  RegisterEventForLanguages( OnLanguageEvent );
    7983
    8084  NameAndVersionEdit.Text := 'NewView ' + GetAppVersion;
    … …  
    107111  RegisterClasses ([TProductInformationForm, TButton,
    108112    TEdit, TImage, TLabel, TBevel]);
     113
    109114  RegisterUpdateProcForLanguages( EnsureProductInformationFormLoaded );
    110115End.

  • trunk/NewView/SearchDirectoriesFormUnit.pas

    r104 r228  
    112112                                                   const Apply: boolean );
    113113begin
    114   LogEvent(LogI18n, 'TSearchDirectoriesForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
     114  // LogEvent(LogI18n, 'TSearchDirectoriesForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
    115115  Language.LoadComponentLanguage( self, Apply );
    116116end;
    … …  
    118118Procedure TSearchDirectoriesForm.SearchDirectoriesFormOnCreate (Sender: TObject);
    119119Begin
    120   RegisterForLanguages( OnLanguageEvent );
     120  RegisterEventForLanguages( OnLanguageEvent );
    121121  ClientWidth := DirectoriesListBox.Left + DirectoriesListBox.Width + DirectoriesListBox.Left;
    122122

  • trunk/NewView/TextSearchQuery.pas

    r116 r228  
    6262Procedure OnLanguageEvent( Language: TLanguageFile;
    6363                           const Apply: boolean );
    64 begin
    65 
    66   Language.Prefix := 'SearchQuery.';
    67   Language.LL( Apply, QueryErrorMissingWord1, 'QueryErrorMissingWord1', 'No search word given after ' );
    68   Language.LL( Apply, QueryErrorMissingWord2, 'QueryErrorMissingWord2', ' before ' );
     64var
     65  tmpPrefix : String;
     66begin
     67  tmpPrefix := 'SearchQuery' + LANGUAGE_LABEL_DELIMITER;
     68  Language.LL( Apply, QueryErrorMissingWord1, tmpPrefix + 'QueryErrorMissingWord1', 'No search word given after ' );
     69  Language.LL( Apply, QueryErrorMissingWord2, tmpPrefix + 'QueryErrorMissingWord2', ' before ' );
    6970end;
    7071

  • trunk/NewView/VersionUnit.pas

    r194 r228  
    1515
    1616const
    17   Version =        'V2.20.beta1'; // $SS_REQUIRE_NEW_VERSION$
    18   BldLevelVersion = '2.20.beta1'; // Embedded for IBM BLDLEVEL tool
     17  Version =        'V2.20.beta2'; // $SS_REQUIRE_NEW_VERSION$
     18  BldLevelVersion = '2.20.beta2'; // Embedded for IBM BLDLEVEL tool
    1919
    2020// RELEASE PROCESS
Note: See TracChangeset for help on using the changeset viewer.