From 7051ff691825c235bef9b48d26a1f45b4cbfb1fe Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 18 Aug 2002 08:55:10 +0000 Subject: [PATCH] started make resource string git-svn-id: trunk@2864 - --- ide/main.pp | 40 ++++++++++++-- lcl/include/defaultbitbtnimages.inc | 84 +++++++++++++++++++++++++++-- 2 files changed, 117 insertions(+), 7 deletions(-) diff --git a/ide/main.pp b/ide/main.pp index 2517c9c634..3bbed7de77 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -173,6 +173,7 @@ type procedure mnuToolSyntaxCheckClicked(Sender : TObject); procedure mnuToolGuessUnclosedBlockClicked(Sender : TObject); procedure mnuToolGuessMisplacedIFDEFClicked(Sender : TObject); + procedure mnuToolMakeResourceStringClicked(Sender : TObject); procedure mnuToolConvertDFMtoLFMClicked(Sender : TObject); procedure mnuToolBuildLazarusClicked(Sender : TObject); procedure mnuToolConfigBuildLazClicked(Sender : TObject); @@ -506,6 +507,7 @@ type procedure DoJumpToGuessedMisplacedIFDEF(FindNext: boolean); procedure DoGotoIncludeDirective; procedure SaveIncludeLinks; + function DoMakeResourceString: TModalResult; // methods for debugging, compiling and external tools function DoJumpToCompilerMessage(Index:integer; @@ -1441,6 +1443,7 @@ begin itmToolSyntaxCheck.OnClick := @mnuToolSyntaxCheckClicked; itmToolGuessUnclosedBlock.OnClick := @mnuToolGuessUnclosedBlockClicked; itmToolGuessMisplacedIFDEF.OnClick := @mnuToolGuessMisplacedIFDEFClicked; + itmToolMakeResourceString.OnClick := @mnuToolMakeResourceStringClicked; itmToolConvertDFMtoLFM.OnClick := @mnuToolConvertDFMtoLFMClicked; itmToolBuildLazarus.OnClick := @mnuToolBuildLazarusClicked; itmToolConfigureBuildLazarus.OnClick := @mnuToolConfigBuildLazClicked; @@ -1779,6 +1782,9 @@ begin ecGuessMisplacedIFDEF: DoJumpToGuessedMisplacedIFDEF(true); + ecMakeResourceString: + DoMakeResourceString; + ecConvertDFM2LFM: DoConvertDFMtoLFM; @@ -2236,6 +2242,11 @@ begin DoJumpToGuessedMisplacedIFDEF(true); end; +procedure TMainIDE.mnuToolMakeResourceStringClicked(Sender : TObject); +begin + DoMakeResourceString; +end; + procedure TMainIDE.mnuToolConvertDFMtoLFMClicked(Sender : TObject); begin DoConvertDFMtoLFM; @@ -6762,10 +6773,10 @@ var ActiveSrcEdit: TSourceEditor; NewX, NewY, NewTopLine: integer; begin if not BeginCodeTool(ActiveSrcEdit,ActiveUnitInfo,[]) then exit; - { $IFDEF IDE_DEBUG} + {$IFDEF IDE_DEBUG} writeln(''); writeln('[TMainIDE.DoGotoIncludeDirective] ************'); - { $ENDIF} + {$ENDIF} if CodeToolBoss.FindEnclosingIncludeDirective(ActiveUnitInfo.Source, ActiveSrcEdit.EditorComponent.CaretX, ActiveSrcEdit.EditorComponent.CaretY, @@ -6785,8 +6796,28 @@ begin CodeToolBoss.SourceCache.SaveIncludeLinksToFile(AFilename); end; +function TMainIDE.DoMakeResourceString: TModalResult; +var + ActiveSrcEdit: TSourceEditor; + ActiveUnitInfo: TUnitInfo; + //StartX, StartY, EndX, EndY: integer; +begin + if not BeginCodeTool(ActiveSrcEdit,ActiveUnitInfo,[]) then exit; + {$IFDEF IDE_DEBUG} + writeln(''); + writeln('[TMainIDE.DoGotoIncludeDirective] ************'); + {$ENDIF} + // ToDo: + // - determine start and end of string constant in source + // - write and open wizard + MessageDlg('Not implemented yet','Sorry, not implemented yet.',mtInformation, + [mbCancel],0); + Result:=mrCancel; +end; + procedure TMainIDE.DoCompleteCodeAtCursor; -var ActiveSrcEdit: TSourceEditor; +var + ActiveSrcEdit: TSourceEditor; ActiveUnitInfo: TUnitInfo; NewSource: TCodeBuffer; NewX, NewY, NewTopLine: integer; @@ -7628,6 +7659,9 @@ end. { ============================================================================= $Log$ + Revision 1.455 2003/01/19 14:44:27 mattias + started make resource string + Revision 1.454 2003/01/15 09:08:08 mattias fixed search paths for virtual projects diff --git a/lcl/include/defaultbitbtnimages.inc b/lcl/include/defaultbitbtnimages.inc index f5051339c4..dcdb4a8ab2 100644 --- a/lcl/include/defaultbitbtnimages.inc +++ b/lcl/include/defaultbitbtnimages.inc @@ -14,8 +14,8 @@ } type - PCharArray = Array[0..18+60] of PChar; - + PCharArray = Array[0..18+60] of PChar; + PCharArray22 = Array[0..22] of PChar; const //IMGOK_Check : array [0..18+60] of PChar = @@ -430,7 +430,83 @@ const '.....rs**tz.........', '......zwxz..........', '.......zz...........'); - - + + IMG_NO : PCharArray22 = + ( + '18 18 4 1', + 'a c #800000', + 'b c #808080', + '# c #ff0000', + '. c None', + '..................', + '......######......', + '....##aaaaaa##....', + '...#aaabbbbaaab...', + '..#aaab....baaab..', + '..#aaaa#.....#ab..', + '.#aabaaa#....#aab.', + '.#ab.baaa#....#ab.', + '.#ab..baaa#...#ab.', + '.#ab...baaa#..#ab.', + '.#ab....baaa#.#ab.', + '.#aab....baaa#aab.', + '..#aa.....baaaab..', + '..#aa##....aaaab..', + '...baaa####aaab...', + '....bbaaaaaabb....', + '......bbbbbb......', + '..................'); + + IMG_RETRY : PCharArray22 = + ( + '19 18 4 1', + 'b c #000080', + 'a c #008000', + '# c #00ff00', + '. c none', + '...................', + '......######.......', + '....##aaaaaa##..#..', + '...#aaaaaaaaaa##ab.', + '..#aaabbbbbaaaaaab.', + '..#aab.....bbaaaab.', + '.#aab.......#aaaab.', + '.#bbb......#aaaaab.', + '............bbbbbb.', + '...................', + '.#######...........', + '.aaaaaa......#bbb..', + '.aaaaa.......#aab..', + '.aaaaa#.....#aaab..', + '.aaaaaa#####aaab...', + '.aabbaaaaaaaaab....', + '.ab..baaaaaabb.....', + '......bbbbbb.......'); + + IMG_IGNIORE: PCharArray22 = + ( + '18 18 5 1', + 'b c #000080', + 'c c #008000', + '# c #008080', + 'a c #00ff00', + '. c none', + '........###.......', + '.......#aab.......', + '.......#acb.......', + '.......bbab.......', + '........ccab......', + '.......ccaaab.....', + '......acaacaab....', + '....#acbaabbcab...', + '..#aacb#acb.#ab...', + '..bbbb##aab.#ab...', + '......#aaacc#b#...', + '.....caacccb#.....', + '....#aabb#cab#....', + '....aab#..#cab....', + '...cacb....#a##...', + '..aaab......cab...', + '.bbbb#.....bbbb...');