fixed registering TProgressBar, disabled docking in TToolBar, return key for codeexplorer, updated finnish translation

git-svn-id: trunk@6463 -
This commit is contained in:
mattias 2005-01-03 01:07:08 +00:00
parent 51fba3ead7
commit f1a8fc0a88
7 changed files with 48 additions and 26 deletions

View File

@ -40,6 +40,7 @@ object CodeExplorerView: TCodeExplorerView
TabOrder = 2 TabOrder = 2
OnDblClick = CodeTreeviewDBLCLICK OnDblClick = CodeTreeviewDBLCLICK
OnDeletion = CodeTreeviewDELETION OnDeletion = CodeTreeviewDELETION
OnKeyUp = CodeTreeviewKeyUp
Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoRightClickSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips] Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoRightClickSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips]
Height = 480 Height = 480
Top = 25 Top = 25

View File

@ -14,12 +14,13 @@ LazarusResources.Add('TCodeExplorerView','FORMDATA',[
+'eeView'#12'CodeTreeview'#5'Align'#7#8'alBottom'#17'DefaultItemHeight'#2#17 +'eeView'#12'CodeTreeview'#5'Align'#7#8'alBottom'#17'DefaultItemHeight'#2#17
+#13'HideSelection'#8#6'Images'#7#10'Imagelist1'#11'ParentCtl3D'#8#9'PopupMen' +#13'HideSelection'#8#6'Images'#7#10'Imagelist1'#11'ParentCtl3D'#8#9'PopupMen'
+'u'#7#13'TreePopupmenu'#16'RightClickSelect'#9#8'TabOrder'#2#2#10'OnDblClick' +'u'#7#13'TreePopupmenu'#16'RightClickSelect'#9#8'TabOrder'#2#2#10'OnDblClick'
+#7#20'CodeTreeviewDBLCLICK'#10'OnDeletion'#7#20'CodeTreeviewDELETION'#7'Opti' +#7#20'CodeTreeviewDBLCLICK'#10'OnDeletion'#7#20'CodeTreeviewDELETION'#7'OnKe'
+'ons'#11#17'tvoAutoItemHeight'#21'tvoKeepCollapsedNodes'#19'tvoRightClickSel' +'yUp'#7#17'CodeTreeviewKeyUp'#7'Options'#11#17'tvoAutoItemHeight'#21'tvoKeep'
+'ect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoToolTips'#0#6 +'CollapsedNodes'#19'tvoRightClickSelect'#14'tvoShowButtons'#12'tvoShowLines'
+'Height'#3#224#1#3'Top'#2#25#5'Width'#3#206#0#0#0#10'TImageList'#10'Imagelis' +#11'tvoShowRoot'#11'tvoToolTips'#0#6'Height'#3#224#1#3'Top'#2#25#5'Width'#3
+'t1'#4'left'#2'@'#3'top'#2' '#0#0#10'TPopupMenu'#13'TreePopupmenu'#4'left'#2 +#206#0#0#0#10'TImageList'#10'Imagelist1'#4'left'#2'@'#3'top'#2' '#0#0#10'TPo'
+'@'#3'top'#2'H'#0#9'TMenuItem'#14'JumpToMenuitem'#7'Caption'#6#14'Jump to so' +'pupMenu'#13'TreePopupmenu'#4'left'#2'@'#3'top'#2'H'#0#9'TMenuItem'#14'JumpT'
+'urce'#7'OnClick'#7#19'JumpToMenuitemCLICK'#0#0#9'TMenuItem'#15'RefreshMenui' +'oMenuitem'#7'Caption'#6#14'Jump to source'#7'OnClick'#7#19'JumpToMenuitemCL'
+'tem'#7'Caption'#6#7'Refresh'#7'OnClick'#7#20'RefreshMenuitemCLICK'#0#0#0#0 +'ICK'#0#0#9'TMenuItem'#15'RefreshMenuitem'#7'Caption'#6#7'Refresh'#7'OnClick'
+#7#20'RefreshMenuitemCLICK'#0#0#0#0
]); ]);

View File

@ -32,8 +32,8 @@ unit CodeExplorer;
interface interface
uses uses
Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, LCLProc, LCLType, LResources, Forms, Controls, Graphics,
Buttons, ComCtrls, Menus, Dialogs, Buttons, ComCtrls, Menus,
CodeToolManager, CodeAtom, CodeCache, CodeTree, PascalParserTool, CodeToolManager, CodeAtom, CodeCache, CodeTree, PascalParserTool,
IDECommands, IDECommands,
LazarusIDEStrConsts, EnvironmentOpts, IDEOptionDefs, InputHistory, IDEProcs, LazarusIDEStrConsts, EnvironmentOpts, IDEOptionDefs, InputHistory, IDEProcs,
@ -53,6 +53,8 @@ type
); );
TCodeExplorerViewFlags = set of TCodeExplorerViewFlag; TCodeExplorerViewFlags = set of TCodeExplorerViewFlag;
{ TCodeExplorerView }
TCodeExplorerView = class(TForm) TCodeExplorerView = class(TForm)
Imagelist1: TIMAGELIST; Imagelist1: TIMAGELIST;
JumpToMenuitem: TMENUITEM; JumpToMenuitem: TMENUITEM;
@ -66,6 +68,8 @@ type
procedure CodeExplorerViewRESIZE(Sender: TObject); procedure CodeExplorerViewRESIZE(Sender: TObject);
procedure CodeTreeviewDBLCLICK(Sender: TObject); procedure CodeTreeviewDBLCLICK(Sender: TObject);
procedure CodeTreeviewDELETION(Sender: TObject; Node: TTreeNode); procedure CodeTreeviewDELETION(Sender: TObject; Node: TTreeNode);
procedure CodeTreeviewKeyUp(Sender: TObject; var Key: Word;
Shift: TShiftState);
procedure JumpToMenuitemCLICK(Sender: TObject); procedure JumpToMenuitemCLICK(Sender: TObject);
procedure OptionsButtonClick(Sender: TObject); procedure OptionsButtonClick(Sender: TObject);
procedure RefreshButtonCLICK(Sender: TObject); procedure RefreshButtonCLICK(Sender: TObject);
@ -243,6 +247,13 @@ begin
TViewNodeData(Node.Data).Free; TViewNodeData(Node.Data).Free;
end; end;
procedure TCodeExplorerView.CodeTreeviewKeyUp(Sender: TObject; var Key: Word;
Shift: TShiftState);
begin
if (Key=VK_RETURN) and (Shift=[]) then
JumpToSelection;
end;
procedure TCodeExplorerView.CodeExplorerViewCLOSE(Sender: TObject; procedure TCodeExplorerView.CodeExplorerViewCLOSE(Sender: TObject;
var CloseAction: TCloseAction); var CloseAction: TCloseAction);
begin begin

View File

@ -480,7 +480,7 @@ msgstr ""
#: lazarusidestrconsts:lisapplicationagraphicallclfreepascalprogramtheprogra #: lazarusidestrconsts:lisapplicationagraphicallclfreepascalprogramtheprogra
msgid "Application%sA graphical lcl/freepascal program. The program file is automatically maintained by lazarus." msgid "Application%sA graphical lcl/freepascal program. The program file is automatically maintained by lazarus."
msgstr "" msgstr "Sovellus %sGraafinen lcl/freepascal ohjelma. Ohjelma tehdään Lazaruksella (Näistä suositeltavin vaihtoehto)."
#: lazarusidestrconsts:dlgbutapply #: lazarusidestrconsts:dlgbutapply
msgid "Apply" msgid "Apply"
@ -680,7 +680,7 @@ msgstr ""
#: lazarusidestrconsts:lismenubuild #: lazarusidestrconsts:lismenubuild
msgid "Build" msgid "Build"
msgstr "Käännä¤" msgstr "Käännä"
#: lazarusidestrconsts:lisbuildcodetools #: lazarusidestrconsts:lisbuildcodetools
msgid "Build CodeTools" msgid "Build CodeTools"
@ -1488,7 +1488,7 @@ msgstr ""
#: lazarusidestrconsts:liscustomprogramafreepascalprogram #: lazarusidestrconsts:liscustomprogramafreepascalprogram
msgid "Custom Program%sA freepascal program." msgid "Custom Program%sA freepascal program."
msgstr "" msgstr "Erikoisohjelma%sFreepascal ohjelma."
#: lazarusidestrconsts:liskeycatcustom #: lazarusidestrconsts:liskeycatcustom
msgid "Custom commands" msgid "Custom commands"
@ -1832,7 +1832,7 @@ msgstr ""
#: lazarusidestrconsts:dlgdownword #: lazarusidestrconsts:dlgdownword
msgid "Down" msgid "Down"
msgstr "Eteenpäin" msgstr ""
#: lazarusidestrconsts:dlgdragdroped #: lazarusidestrconsts:dlgdragdroped
msgid "Drag Drop Editing" msgid "Drag Drop Editing"
@ -2364,7 +2364,7 @@ msgstr ""
#: lazarusidestrconsts:lisfrifindorrenameidentifier #: lazarusidestrconsts:lisfrifindorrenameidentifier
msgid "Find or Rename Identifier" msgid "Find or Rename Identifier"
msgstr "Etsi tai vaihda tunnisteiden nimiä¤" msgstr "Etsi tai vaihda tunnisteiden nimiä¤"
#: lazarusidestrconsts:lismenufindblockotherendofcodeblock #: lazarusidestrconsts:lismenufindblockotherendofcodeblock
msgid "Find other end of code block" msgid "Find other end of code block"
@ -4556,7 +4556,7 @@ msgstr "Ohjelman lähkekoodin tiedosto tarkennin pitää olla .pas, .pp tai .lpr
#: lazarusidestrconsts:lisprogramafreepascalprogramtheprogramfileisautomatic #: lazarusidestrconsts:lisprogramafreepascalprogramtheprogramfileisautomatic
msgid "Program%sA freepascal program. The program file is automatically maintained by lazarus." msgid "Program%sA freepascal program. The program file is automatically maintained by lazarus."
msgstr "" msgstr "Ohjelma%s Freepascal ohjelma. Ohjelmatiedosto hyödyntää lazarusta."
#: lazarusidestrconsts:lisedtexttoolprogramfilename #: lazarusidestrconsts:lisedtexttoolprogramfilename
msgid "Programfilename:" msgid "Programfilename:"
@ -4884,7 +4884,7 @@ msgstr ""
#: lazarusidestrconsts:lisrenamefile #: lazarusidestrconsts:lisrenamefile
msgid "Rename file?" msgid "Rename file?"
msgstr "" msgstr "Muutetaanko tiedoston nimeä?"
#: lazarusidestrconsts:srkmecrenameidentifier #: lazarusidestrconsts:srkmecrenameidentifier
msgid "Rename identifier" msgid "Rename identifier"
@ -5056,7 +5056,7 @@ msgstr "venäjä(CP1251)"
#: lazarusidestrconsts:rslanguagerussianutf #: lazarusidestrconsts:rslanguagerussianutf
msgid "Russian(UTF8)" msgid "Russian(UTF8)"
msgstr "" msgstr "venäjä(UTF8)"
#: lazarusidestrconsts:dlgbckupsubdir #: lazarusidestrconsts:dlgbckupsubdir
msgid "Same name (in subdirectory)" msgid "Same name (in subdirectory)"
@ -6308,7 +6308,7 @@ msgstr ""
#: lazarusidestrconsts:listheunitisnotlowercasethefreepascalcompiler10xneeds #: lazarusidestrconsts:listheunitisnotlowercasethefreepascalcompiler10xneeds
msgid "The unit %s%s%s is not lowercase.%sThe FreePascal compiler 1.0.x needs lowercase filenames. If you do not use the fpc 1.0.x to compile this unit, you can ignore this message.%s%sRename file?" msgid "The unit %s%s%s is not lowercase.%sThe FreePascal compiler 1.0.x needs lowercase filenames. If you do not use the fpc 1.0.x to compile this unit, you can ignore this message.%s%sRename file?"
msgstr "" msgstr "Käännösyksikön (unit) %s%s%s nimeä käytetään jo projektissa.%sOhita-näppäin jatkaa nimenvaihtoa,%sPeru-näppäin peruuttaa tämän tallennuksen ja Keskeytä-näppäin lopettaa kaikki tallennukset."
#: lazarusidestrconsts:listheunititselfhasalreadythenamepascalidentifiersmus #: lazarusidestrconsts:listheunititselfhasalreadythenamepascalidentifiersmus
msgid "The unit itself has already the name %s%s%s. Pascal identifiers must be unique." msgid "The unit itself has already the name %s%s%s. Pascal identifiers must be unique."
@ -6432,7 +6432,7 @@ msgstr ""
#: lazarusidestrconsts:listhislookslikeapascalfilefpc10xexpectspascalfiles #: lazarusidestrconsts:listhislookslikeapascalfilefpc10xexpectspascalfiles
msgid "This looks like a pascal file.%sfpc 1.0.x expects pascal files lowercase.%sRename it to lowercase?" msgid "This looks like a pascal file.%sfpc 1.0.x expects pascal files lowercase.%sRename it to lowercase?"
msgstr "" msgstr "Tämä vaikuttaa pascal tiedostolta.%sfpc 1.0.x odottaa että pascal tiedostot nimetään pienillä kirjaimilla.%s Tallennetaanko tämä käyttäen pieniä kirjaimia?"
#: lazarusidestrconsts:lispkgsysthispackageisinstalledbutthelpkfilewasnotfound #: lazarusidestrconsts:lispkgsysthispackageisinstalledbutthelpkfilewasnotfound
msgid "This package is installed, but the lpk file was not found.All its components are deactivated. Please fix this." msgid "This package is installed, but the lpk file was not found.All its components are deactivated. Please fix this."
@ -6956,7 +6956,7 @@ msgstr ""
#: lazarusidestrconsts:lisunitnamealreadyexistscap #: lazarusidestrconsts:lisunitnamealreadyexistscap
msgid "Unitname already in project" msgid "Unitname already in project"
msgstr "" msgstr "Tätä Käännösyksikön nimeä käytetään jo projektissa"
#: lazarusidestrconsts:lismenuviewunits #: lazarusidestrconsts:lismenuviewunits
msgid "Units..." msgid "Units..."
@ -6976,7 +6976,7 @@ msgstr ""
#: lazarusidestrconsts:dlgupword #: lazarusidestrconsts:dlgupword
msgid "Up" msgid "Up"
msgstr "Taaksepäin" msgstr ""
#: lazarusidestrconsts:lispckoptsupdaterebuild #: lazarusidestrconsts:lispckoptsupdaterebuild
msgid "Update/Rebuild" msgid "Update/Rebuild"

View File

@ -2255,7 +2255,7 @@ end;
procedure Register; procedure Register;
begin begin
RegisterComponents('Common Controls',[TTrackbar,TCustomProgressBar,TTreeView, RegisterComponents('Common Controls',[TTrackbar,TProgressBar,TTreeView,
TListView,TStatusBar,TToolBar,TUpDown,TPageControl,TTabControl]); TListView,TStatusBar,TToolBar,TUpDown,TPageControl,TTabControl]);
RegisterNoIcon([TToolButton,TTabSheet]); RegisterNoIcon([TToolButton,TTabSheet]);
end; end;
@ -2284,6 +2284,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.155 2005/01/03 01:07:08 mattias
fixed registering TProgressBar, disabled docking in TToolBar, return key for codeexplorer, updated finnish translation
Revision 1.154 2005/01/01 18:56:47 mattias Revision 1.154 2005/01/01 18:56:47 mattias
implemented TTIProgressBar implemented TTIProgressBar

View File

@ -99,7 +99,6 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TControl.DoDock(NewDockSite: TWinControl; var ARect: TRect); procedure TControl.DoDock(NewDockSite: TWinControl; var ARect: TRect);
begin begin
if (NewDockSite = nil) then Parent := nil; if (NewDockSite = nil) then Parent := nil;
if NewDockSite<>nil then begin if NewDockSite<>nil then begin
DebugLn('TControl.DoDock BEFORE Adjusting ',Name,' ',dbgs(ARect)); DebugLn('TControl.DoDock BEFORE Adjusting ',Name,' ',dbgs(ARect));
@ -3460,6 +3459,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.229 2005/01/03 01:07:08 mattias
fixed registering TProgressBar, disabled docking in TToolBar, return key for codeexplorer, updated finnish translation
Revision 1.228 2005/01/01 14:38:36 mattias Revision 1.228 2005/01/01 14:38:36 mattias
fixed loading TMemo.Lines - During Loading fixed loading TMemo.Lines - During Loading

View File

@ -364,8 +364,9 @@ var
I: Integer; I: Integer;
begin begin
// dock controls after streaming // dock controls after streaming
for I := 0 to ControlCount - 1 do // TODO: activate when docking finished
Controls[I].HostDockSite := Self; //for I := 0 to ControlCount - 1 do
// Controls[I].HostDockSite := Self;
inherited Loaded; inherited Loaded;
UpdateVisibleBar; UpdateVisibleBar;
end; end;
@ -618,6 +619,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.35 2005/01/03 01:07:08 mattias
fixed registering TProgressBar, disabled docking in TToolBar, return key for codeexplorer, updated finnish translation
Revision 1.34 2004/11/28 00:55:44 mattias Revision 1.34 2004/11/28 00:55:44 mattias
deactivated sending SYSKey messages in gtk intf - they are not used anyway deactivated sending SYSKey messages in gtk intf - they are not used anyway