diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas index 0b50d70801..57a6314e4a 100644 --- a/components/codetools/definetemplates.pas +++ b/components/codetools/definetemplates.pas @@ -3087,7 +3087,8 @@ begin DirTempl.AddChild(TDefineTemplate.Create('LCL path addition', Format(ctsAddsDirToSourcePath,['lcl']), ExternalMacroStart+'SrcPath', - '..'+ds+'lcl' + '..' + +';..'+ds+'lcl' +';..'+ds+'lcl'+ds+'interfaces'+ds+WidgetType +';'+SrcPath ,da_DefineRecurse)); diff --git a/debugger/breakpointsdlg.pp b/debugger/breakpointsdlg.pp index 288b353b72..3da696065e 100644 --- a/debugger/breakpointsdlg.pp +++ b/debugger/breakpointsdlg.pp @@ -126,6 +126,7 @@ end; constructor TBreakPointsDlg.Create(AOwner: TComponent); begin inherited; + Name:='BreakPointsDlg'; FBreakpointsNotification := TDBGBreakPointsNotification.Create; FBreakpointsNotification.AddReference; FBreakpointsNotification.OnAdd := @BreakPointAdd; @@ -271,6 +272,9 @@ end. { ============================================================================= $Log$ + Revision 1.9 2003/05/18 10:42:57 mattias + implemented deleting empty submenus + Revision 1.8 2003/02/28 19:10:25 mattias added new ... dialog diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas index 2b60036f7e..7ef7f0493b 100644 --- a/ide/debugmanager.pas +++ b/ide/debugmanager.pas @@ -39,13 +39,22 @@ uses {$IFDEF IDE_MEM_CHECK} MemCheck, {$ENDIF} - Classes, SysUtils, Forms, Controls, Dialogs, CompilerOptions, EditorOptions, - EnvironmentOpts, KeyMapping, UnitEditor, Project, IDEProcs, - Debugger, RunParamsOpts, ExtToolDialog, LazarusIDEStrConsts, - ProjectDefs, BaseDebugManager, MainBar, DebuggerDlg, FileCtrl; - + Classes, SysUtils, Forms, Controls, Dialogs, Menus, FileCtrl, + CompilerOptions, EditorOptions, EnvironmentOpts, KeyMapping, UnitEditor, + Project, IDEProcs, Debugger, RunParamsOpts, ExtToolDialog, IDEOptionDefs, + LazarusIDEStrConsts, ProjectDefs, BaseDebugManager, MainBar, DebuggerDlg, + Watchesdlg, BreakPointsdlg, LocalsDlg, DBGOutputForm, GDBMIDebugger, + CallStackDlg; + + type - TDebugDialogType = (ddtOutput, ddtBreakpoints, ddtWatches, ddtLocals, ddtCallStack); + TDebugDialogType = ( + ddtOutput, + ddtBreakpoints, + ddtWatches, + ddtLocals, + ddtCallStack + ); TDebugManager = class(TBaseDebugManager) // Menu events @@ -64,7 +73,7 @@ type private FBreakPoints: TDBGBreakPoints; // Points to debugger breakpoints if available // Else to own objet - FWatches: TDBGWatches; // Points to debugger watchess if available + FWatches: TDBGWatches; // Points to debugger watches if available // Else to own objet FDialogs: array[TDebugDialogType] of TDebuggerDlg; @@ -100,12 +109,11 @@ type implementation -uses - Menus, - Watchesdlg, BreakPointsdlg, LocalsDlg, DBGOutputForm, GDBMIDebugger, - CallStackDlg; +const + DebugDlgIDEWindow: array[TDebugDialogType] of TNonModalIDEWindow = ( + nmiwDbgOutput, nmiwBreakPoints, nmiwWatches, nmiwLocals, nmiwCallStack + ); - //----------------------------------------------------------------------------- // Menu events //----------------------------------------------------------------------------- @@ -335,20 +343,26 @@ const begin if FDialogs[ADialogType] = nil then begin - try + //try FDialogs[ADialogType] := DEBUGDIALOGCLASS[ADialogType].Create(Self); - except + {except on E: Exception do begin WriteLN('[ERROR] IDE: Probably FPC bug #1888 caused an exception while creating class ''', DEBUGDIALOGCLASS[ADialogType].ClassName, ''''); WriteLN('[ERROR] IDE: Exception message: ', E.Message); Exit; end; - end; + end;} + FDialogs[ADialogType].Name:= + NonModalIDEWindowNames[DebugDlgIDEWindow[ADialogType]]; FDialogs[ADialogType].Tag := Integer(ADialogType); FDialogs[ADialogType].OnDestroy := @DebugDialogDestroy; DoInitDebugger; FDialogs[ADialogType].Debugger := FDebugger; +writeln('TDebugManager.ViewDebugDialog A ',FDialogs[ADialogType].Name); + EnvironmentOptions.IDEWindowLayoutList.Apply( + FDialogs[ADialogType],FDialogs[ADialogType].Name); end; +writeln('TDebugManager.ViewDebugDialog B ',FDialogs[ADialogType].Name,' ',FDialogs[ADialogType].Left,',',FDialogs[ADialogType].Top,',',FDialogs[ADialogType].Width,',',FDialogs[ADialogType].Height); FDialogs[ADialogType].Show; FDialogs[ADialogType].BringToFront; end; @@ -365,10 +379,10 @@ end; constructor TDebugManager.Create(TheOwner: TComponent); var DialogType: TDebugDialogType; -begin - for DialogType := Low(TDebugDialogType) to High(TDebugDialogType) do +begin + for DialogType := Low(TDebugDialogType) to High(TDebugDialogType) do FDialogs[DialogType] := nil; - + FDebugger := nil; FBreakPoints := TDBGBreakPoints.Create(nil, TDBGBreakPoint); FWatches := TDBGWatches.Create(nil, TDBGWatch); @@ -666,6 +680,9 @@ end. { ============================================================================= $Log$ + Revision 1.14 2003/05/18 10:42:57 mattias + implemented deleting empty submenus + Revision 1.13 2003/05/03 23:00:33 mattias localization diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp index e42cc49bfe..fab79e42e5 100644 --- a/ide/environmentopts.pp +++ b/ide/environmentopts.pp @@ -232,6 +232,7 @@ type property Filename: string read FFilename write SetFilename; procedure SetLazarusDefaultFilename; procedure GetDefaultFPCSourceDirectory; + procedure CreateWindowLayout(const TheFormID: string); property OnApplyWindowLayout: TOnApplyIDEWindowLayout read FOnApplyWindowLayout write SetOnApplyWindowLayout; @@ -583,6 +584,7 @@ implementation const MaxComboBoxCount: integer = 20; + function Max(i, j: integer): integer; begin if i<=j then @@ -1213,22 +1215,7 @@ begin end; procedure TEnvironmentOptions.InitLayoutList; - - procedure CreateWindowLayout(const TheFormID: string); - var - NewLayout: TIDEWindowLayout; - begin - NewLayout:=TIDEWindowLayout.Create; - with NewLayout do begin - FormID:=TheFormID; - WindowPlacementsAllowed:=[iwpRestoreWindowGeometry,iwpDefault, - iwpCustomPosition,iwpUseWindowManagerSetting]; - end; - IDEWindowLayoutList.Add(NewLayout); - end; - var - i: integer; l: TNonModalIDEWindow; begin fIDEWindowLayoutList:=TIDEWindowLayoutList.Create; @@ -1237,11 +1224,6 @@ begin if l<>nmiwNone then CreateWindowLayout(NonModalIDEWindowNames[l]); CreateWindowLayout(DefaultObjectInspectorName); - - for i:=0 to fIDEWindowLayoutList.Count-1 do begin - IDEWindowLayoutList[i].OnApply:=@InternOnApplyWindowLayout; - IDEWindowLayoutList[i].DefaultWindowPlacement:=iwpRestoreWindowGeometry; - end; end; procedure TEnvironmentOptions.InternOnApplyWindowLayout( @@ -1250,6 +1232,25 @@ begin if Assigned(OnApplyWindowLayout) then OnApplyWindowLayout(ALayout); end; +procedure TEnvironmentOptions.CreateWindowLayout(const TheFormID: string); +var + NewLayout: TIDEWindowLayout; +begin + if TheFormID='' then + RaiseException('TEnvironmentOptions.CreateWindowLayout TheFormID empty'); + if IDEWindowLayoutList.ItemByFormID(TheFormID)<>nil then + RaiseException('TEnvironmentOptions.CreateWindowLayout TheFormID exists'); + NewLayout:=TIDEWindowLayout.Create; + with NewLayout do begin + FormID:=TheFormID; + WindowPlacementsAllowed:=[iwpRestoreWindowGeometry,iwpDefault, + iwpCustomPosition,iwpUseWindowManagerSetting]; + OnApply:=@Self.InternOnApplyWindowLayout; + DefaultWindowPlacement:=iwpRestoreWindowGeometry; + end; + IDEWindowLayoutList.Add(NewLayout); +end; + function TEnvironmentOptions.FileHasChangedOnDisk: boolean; begin Result:=FFileHasChangedOnDisk diff --git a/ide/ideoptiondefs.pas b/ide/ideoptiondefs.pas index e0d3e615ee..f782b270eb 100644 --- a/ide/ideoptiondefs.pas +++ b/ide/ideoptiondefs.pas @@ -46,7 +46,12 @@ type nmiwCodeExplorerName, nmiwClipbrdHistoryName, nmiwPkgGraphExplorer, - nmiwProjectInspector + nmiwProjectInspector, + nmiwDbgOutput, + nmiwBreakPoints, + nmiwWatches, + nmiwLocals, + nmiwCallStack ); // form names for non modal IDE windows: @@ -60,7 +65,12 @@ const 'CodeExplorer', 'ClipBrdHistory', 'PkgGraphExplorer', - 'ProjectInspector' + 'ProjectInspector', + 'DbgOutput', + 'BreakPoints', + 'Watches', + 'Locals', + 'CallStack' ); type diff --git a/ide/unitdependencies.pas b/ide/unitdependencies.pas index 70e1e9125a..6fffdd842c 100644 --- a/ide/unitdependencies.pas +++ b/ide/unitdependencies.pas @@ -167,6 +167,8 @@ type procedure RefreshButtonClick(Sender: TObject); procedure SelectUnitButtonClick(Sender: TObject); procedure ShowProjectButtonClick(Sender: TObject); + procedure UnitDependenciesViewClose(Sender: TObject; + var Action: TCloseAction); procedure UnitDependenciesViewResize(Sender: TObject); procedure UnitHistoryListChange(Sender: TObject); procedure UnitHistoryListKeyUp(Sender: TObject; var Key: Word; @@ -254,6 +256,12 @@ begin end; end; +procedure TUnitDependenciesView.UnitDependenciesViewClose(Sender: TObject; + var Action: TCloseAction); +begin + EnvironmentOptions.IDEWindowLayoutList.ItemByForm(Self).GetCurrentPosition; +end; + procedure TUnitDependenciesView.UnitDependenciesViewResize(Sender: TObject); begin DoResize; @@ -423,110 +431,106 @@ constructor TUnitDependenciesView.Create(TheOwner: TComponent); end; var - ALayout: TIDEWindowLayout; - W : Integer; + W: Integer; begin inherited Create(TheOwner); - if LazarusResources.Find(ClassName)=nil then + + Name:=NonModalIDEWindowNames[nmiwUnitDependenciesName]; + Caption := dlgUnitDepCaption; + EnvironmentOptions.IDEWindowLayoutList.Apply(Self,Name); + + SrcTypeImageList:=TImageList.Create(Self); + with SrcTypeImageList do begin - Name:=NonModalIDEWindowNames[nmiwUnitDependenciesName]; - Caption := dlgUnitDepCaption; - ALayout:=EnvironmentOptions.IDEWindowLayoutList.ItemByFormID(Name); - ALayout.Form:=TForm(Self); - ALayout.Apply; - - SrcTypeImageList:=TImageList.Create(Self); - with SrcTypeImageList do - begin - Name:='SrcTypeImageList'; - Width:=22; - Height:=22; - AddResImg(SrcTypeImageList,'srctype_unknown_22x22'); // 0 - AddResImg(SrcTypeImageList,'srctype_unit_22x22'); // 1 - AddResImg(SrcTypeImageList,'srctype_program_22x22'); // 2 - AddResImg(SrcTypeImageList,'srctype_library_22x22'); // 3 - AddResImg(SrcTypeImageList,'srctype_package_22x22'); // 4 - AddResImg(SrcTypeImageList,'srctype_filenotfound_22x22'); // 5 - AddResImg(SrcTypeImageList,'srctype_parseerror_22x22'); // 6 - AddResImg(SrcTypeImageList,'srctype_forbiddencircle_22x22'); // 7 - AddResImg(SrcTypeImageList,'srctype_circle_22x22'); // 8 - end; - - UnitHistoryList:=TComboBox.Create(Self); - with UnitHistoryList do - begin - Name:='UnitHistoryList'; - Parent:=Self; - Left:=0; - Top:=0; - Width:=Parent.ClientWidth-Left; - RefreshHistoryList; - OnKeyUp:=@UnitHistoryListKeyUp; - OnChange:=@UnitHistoryListChange; - Visible:=true; - end; - - W:=90; //Used foro simplified the update - SelectUnitButton:=TBitBtn.Create(Self); - with SelectUnitButton do - begin - Name:='SelectUnitButton'; - Parent:=Self; - Left:=0; - Top:=UnitHistoryList.Top+UnitHistoryList.Height+2; - Width:=W; - Caption:=dlgUnitDepBrowse; - OnClick:=@SelectUnitButtonClick; - Visible:=true; - end; - - RefreshButton:=TBitBtn.Create(Self); - with RefreshButton do - begin - Name:='RefreshButton'; - Parent:=Self; - Left:=SelectUnitButton.Left+SelectUnitButton.Width+5; - Top:=SelectUnitButton.Top; - Width:=W; - Height:=SelectUnitButton.Height; - Caption:=dlgUnitDepRefresh; - OnClick:=@RefreshButtonClick; - Visible:=true; - end; - - ShowProjectButton:=TBitBtn.Create(Self); - with ShowProjectButton do - begin - Name:='ShowProjectButton'; - Parent:=Self; - Left:=RefreshButton.Left+RefreshButton.Width+5; - Top:=RefreshButton.Top; - Width:=W; - Height:=RefreshButton.Height; - Caption:=dlgEnvProject; - OnClick:=@ShowProjectButtonClick; - Visible:=true; - end; - - UnitTreeView:=TTreeView.Create(Self); - with UnitTreeView do begin - Name:='UnitTreeView'; - Parent:=Self; - Left:=0; - Top:=SelectUnitButton.Top+SelectUnitButton.Height+2; - Width:=Parent.ClientWidth; - Height:=Parent.ClientHeight-Top; - OnExpanding:=@UnitTreeViewExpanding; - OnCollapsing:=@UnitTreeViewCollapsing; - Images:=SrcTypeImageList; - //StateImages:=SrcTypeImageList; - OnAdvancedCustomDrawItem:=@UnitTreeViewAdvancedCustomDrawItem; - OnMouseDown:=@UnitTreeViewMouseDown; - Visible:=true; - end; - - OnResize:=@UnitDependenciesViewResize; + Name:='SrcTypeImageList'; + Width:=22; + Height:=22; + AddResImg(SrcTypeImageList,'srctype_unknown_22x22'); // 0 + AddResImg(SrcTypeImageList,'srctype_unit_22x22'); // 1 + AddResImg(SrcTypeImageList,'srctype_program_22x22'); // 2 + AddResImg(SrcTypeImageList,'srctype_library_22x22'); // 3 + AddResImg(SrcTypeImageList,'srctype_package_22x22'); // 4 + AddResImg(SrcTypeImageList,'srctype_filenotfound_22x22'); // 5 + AddResImg(SrcTypeImageList,'srctype_parseerror_22x22'); // 6 + AddResImg(SrcTypeImageList,'srctype_forbiddencircle_22x22'); // 7 + AddResImg(SrcTypeImageList,'srctype_circle_22x22'); // 8 end; + + UnitHistoryList:=TComboBox.Create(Self); + with UnitHistoryList do + begin + Name:='UnitHistoryList'; + Parent:=Self; + Left:=0; + Top:=0; + Width:=Parent.ClientWidth-Left; + RefreshHistoryList; + OnKeyUp:=@UnitHistoryListKeyUp; + OnChange:=@UnitHistoryListChange; + Visible:=true; + end; + + W:=90; //Used foro simplified the update + SelectUnitButton:=TBitBtn.Create(Self); + with SelectUnitButton do + begin + Name:='SelectUnitButton'; + Parent:=Self; + Left:=0; + Top:=UnitHistoryList.Top+UnitHistoryList.Height+2; + Width:=W; + Caption:=dlgUnitDepBrowse; + OnClick:=@SelectUnitButtonClick; + Visible:=true; + end; + + RefreshButton:=TBitBtn.Create(Self); + with RefreshButton do + begin + Name:='RefreshButton'; + Parent:=Self; + Left:=SelectUnitButton.Left+SelectUnitButton.Width+5; + Top:=SelectUnitButton.Top; + Width:=W; + Height:=SelectUnitButton.Height; + Caption:=dlgUnitDepRefresh; + OnClick:=@RefreshButtonClick; + Visible:=true; + end; + + ShowProjectButton:=TBitBtn.Create(Self); + with ShowProjectButton do + begin + Name:='ShowProjectButton'; + Parent:=Self; + Left:=RefreshButton.Left+RefreshButton.Width+5; + Top:=RefreshButton.Top; + Width:=W; + Height:=RefreshButton.Height; + Caption:=dlgEnvProject; + OnClick:=@ShowProjectButtonClick; + Visible:=true; + end; + + UnitTreeView:=TTreeView.Create(Self); + with UnitTreeView do begin + Name:='UnitTreeView'; + Parent:=Self; + Left:=0; + Top:=SelectUnitButton.Top+SelectUnitButton.Height+2; + Width:=Parent.ClientWidth; + Height:=Parent.ClientHeight-Top; + OnExpanding:=@UnitTreeViewExpanding; + OnCollapsing:=@UnitTreeViewCollapsing; + Images:=SrcTypeImageList; + //StateImages:=SrcTypeImageList; + OnAdvancedCustomDrawItem:=@UnitTreeViewAdvancedCustomDrawItem; + OnMouseDown:=@UnitTreeViewMouseDown; + Visible:=true; + end; + + OnResize:=@UnitDependenciesViewResize; + OnClose:=@UnitDependenciesViewClose; end; destructor TUnitDependenciesView.Destroy; diff --git a/languages/lazaruside.de.po b/languages/lazaruside.de.po index 5bcc68d5b2..eae719537b 100644 --- a/languages/lazaruside.de.po +++ b/languages/lazaruside.de.po @@ -1,3 +1,13 @@ +msgid "" +msgstr "" +"" +"Last-Translator: Mattias Gaertner\n" +"PO-Revision-Date: 2003-05-17 14:02+0200\n" +"Language-Team: Deutsch \n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 0.9.6\n" + #: lazarusidestrconsts:lisprimaryconfigdirectorywherelazarusstoresitsconfig msgid " primary config directory, where Lazarus stores its config files. Default is " msgstr "" @@ -16,51 +26,51 @@ msgstr "" #: lazarusidestrconsts:liscodetemplatokenalreadyexists msgid " A token %s%s%s already exists! " -msgstr "" +msgstr " Das Token %s%s%s existiert bereits! " #: lazarusidestrconsts:srkmconflicw msgid " conflicts with " -msgstr "" +msgstr " steht im Konflikt mit " #: lazarusidestrconsts:srkmalreadyconnected msgid " The key \"%s\" is already connected to \"%s\"." -msgstr "" +msgstr "Die Taste \"%s\" ist bereits belegt auf \"%s\"." #: lazarusidestrconsts:lisnewproject msgid "%s - (new project)" -msgstr "" +msgstr "%s - (Neues Projekt)" #: lazarusidestrconsts:lisuidbytes msgid "%s bytes" -msgstr "" +msgstr "%s Bytes" #: lazarusidestrconsts:liscodetoolsdefsdirectory msgid "%s directory" -msgstr "" +msgstr "%s Verzeichnis" #: lazarusidestrconsts:lisisalreadypartoftheproject msgid "%s is already part of the Project." -msgstr "" +msgstr "%s ist bereits im Projekt" #: lazarusidestrconsts:liscodetoolsdefsprojectdirectory2 msgid "%s project directory" -msgstr "" +msgstr "%s Projekt Verzeichnis" #: lazarusidestrconsts:lisisaninvalidprojectnamepleasechooseanotheregproject msgid "%s%s%s is an invalid project name.%sPlease choose another (e.g. project1.lpi)" -msgstr "" +msgstr "%s%s%s ist kein gueltiger Projekt Name.%s(Gueltig ist zum Beispiel: project1.lpi)" #: lazarusidestrconsts:lissvuoisnotavalididentifier msgid "%s%s%s is not a valid identifier." -msgstr "" +msgstr "%s%s%s ist keine guelitger Identifier." #: lazarusidestrconsts:lisa2pisnotavalidunitname msgid "%s%s%s is not a valid unit name." -msgstr "" +msgstr "%s%s%s ist kein gueltiger unit Name." #: lazarusidestrconsts:lispkgsysfilename msgid "%s%sFile Name: %s%s%s" -msgstr "" +msgstr "%s%sDateiname: %s%s%s" #: lazarusidestrconsts:lispkgsysunitname msgid "%s%sUnit Name: %s%s%s" @@ -68,47 +78,47 @@ msgstr "" #: lazarusidestrconsts:liscodetoolsdefsautogenerated msgid "%s, auto generated" -msgstr "" +msgstr "%s, automatisch erzeugt" #: lazarusidestrconsts:lispckeditpage msgid "%s, Page: %s" -msgstr "" +msgstr "%s, Reiter: %s" #: lazarusidestrconsts:liscodetoolsdefsprojectspecific msgid "%s, project specific" -msgstr "" +msgstr "%s, Projekt spezifisch" #: lazarusidestrconsts:lisuereadonly msgid "%s/ReadOnly" -msgstr "" +msgstr "%s/Nur Lesbar" #: lazarusidestrconsts:lisoipdescriptiondescription msgid "%sDescription: %s" -msgstr "" +msgstr "%sBeschreibung: %s" #: lazarusidestrconsts:lisa2pexistingfile msgid "%sExisting file: %s%s%s" -msgstr "" +msgstr "%sVorhandene Datei: %s%s%s" #: lazarusidestrconsts:dlgpasautolower msgid "%sSave As%s always saves pascal files lowercase" -msgstr "" +msgstr "%sSpeichern als%s speichert Pascal Dateien immer kleingeschrieben" #: lazarusidestrconsts:dlgpasasklower msgid "%sSave As%s asks to save pascal files lowercase" -msgstr "" +msgstr "%sSpeichern als%s fragt, ob Pascal Dateinamen kleingeschrieben werden sollen" #: lazarusidestrconsts:lispckexplstate msgid "%sState: " -msgstr "" +msgstr "%sStatus: " #: lazarusidestrconsts:lisoipthispackageisinstalledbutthelpkfilewasnotfound msgid "%sThis package is installed, but the lpk file was not found" -msgstr "" +msgstr "%sPaket ist installiert, aber die .lpk Datei wurde nicht gefunden" #: lazarusidestrconsts:lisoipthispackagewasautomaticallycreated msgid "%sThis package was automatically created" -msgstr "" +msgstr "%sDieses Paket wurde automatisch erzeugt" #: lazarusidestrconsts:uemaddwatchatcursor msgid "&Add Watch At Cursor" @@ -192,11 +202,11 @@ msgstr "" #: lazarusidestrconsts:dlgbakdirectory msgid "(no subdirectoy)" -msgstr "" +msgstr "(kein Unterverzeichnis)" #: lazarusidestrconsts:listmunknownmacro msgid "(unknown macro: %s)" -msgstr "" +msgstr "(unbekanntes Makro: %s)" #: lazarusidestrconsts:lislazarusversionstring msgid "0.8.5 alpha" @@ -204,15 +214,15 @@ msgstr "" #: lazarusidestrconsts:lisa2pchooseanexistingfile msgid "" -msgstr "" +msgstr "" #: lazarusidestrconsts:dlgdoesnotexist msgid "\" does not exist." -msgstr "" +msgstr "\" nicht gefunden." #: lazarusidestrconsts:uefilerotext2 msgid "\" is not writable." -msgstr "" +msgstr "\" ist schreibgeschuetzt." #: lazarusidestrconsts:rslanguagerussian msgid "\362\325\323\323\313\311\312" @@ -220,19 +230,19 @@ msgstr "" #: lazarusidestrconsts:lisafilealreadyexistsreplaceit msgid "A file %s%s%s already exists.%sReplace it?" -msgstr "" +msgstr "Die Datei %s%s%s exitiert bereits.%sErsetzen?" #: lazarusidestrconsts:lisa2papascalunitmusthavetheextensionpporpas msgid "A pascal unit must have the extension .pp or .pas" -msgstr "" +msgstr "Eine Pascal unit muss auf .pp oder .pas enden." #: lazarusidestrconsts:lispkgmangarequiredpackageswasnotfound msgid "A required packages was not found. See package graph." -msgstr "" +msgstr "Ein benoetigtes Paket wurde nicht gefunden. Siehe Paket Graph." #: lazarusidestrconsts:lisedtexttoolavalidtoolneedsatleastatitleandafilename msgid "A valid tool needs at least a title and a filename." -msgstr "" +msgstr "A valid tool needs at least a title and a filename." #: lazarusidestrconsts:lismenuaboutlazarus msgid "About Lazarus" @@ -370,6 +380,10 @@ msgstr "" msgid "Ambigious file found" msgstr "" +#: lazarusidestrconsts:lisambigiousfilefoundthisfilecanbemistakenwithdelete +msgid "Ambigious file found: %s%s%s%sThis file can be mistaken with %s%s%s%s%sDelete the ambigious file?" +msgstr "" + #: lazarusidestrconsts:lisambigiousfilesfound msgid "Ambigious files found" msgstr "" @@ -658,6 +672,10 @@ msgstr "" msgid "Call Stack" msgstr "Stack" +#: lazarusidestrconsts:liscannotcreatefile +msgid "Can not create file %s%s%s" +msgstr "" + #: lazarusidestrconsts:lispkgsyscannotregistercomponentswithoutunit msgid "Can not register components without unit" msgstr "" @@ -874,8 +892,8 @@ msgstr "" msgid "Command " msgstr "" -#: lazarusidestrconsts:liscommandafterpublishingproject -msgid "Command after publishing project" +#: lazarusidestrconsts:liscommandafterpublishingmodule +msgid "Command after publishing module" msgstr "" #: lazarusidestrconsts:srkmcatcmdcmd @@ -1246,10 +1264,6 @@ msgstr "" msgid "Delete" msgstr "" -#: lazarusidestrconsts:lisdeleteambigiousfile2 -msgid "Delete ambigious file %s%s%s?" -msgstr "" - #: lazarusidestrconsts:lisdeleteambigiousfile msgid "Delete ambigious file?" msgstr "" @@ -1446,6 +1460,10 @@ msgstr "" msgid "Do not split line In front of:" msgstr "" +#: lazarusidestrconsts:lispkgeditdoyoureallywanttoforgetallchangestopackageand +msgid "Do you really want to forget all changes to package %s and reload it from file?" +msgstr "" + #: lazarusidestrconsts:rsiwpdocked msgid "Docked" msgstr "" @@ -3202,6 +3220,10 @@ msgstr "" msgid "New Unit" msgstr "Neue Unit" +#: lazarusidestrconsts:lispkgeditnewunitnotinunitpath +msgid "New unit not in unitpath" +msgstr "" + #: lazarusidestrconsts:liscodetoolsoptsnewline msgid "Newline" msgstr "" @@ -3806,6 +3828,10 @@ msgstr "" msgid "Property completion" msgstr "" +#: lazarusidestrconsts:lispkgeditpublishpackage +msgid "Publish Package" +msgstr "" + #: lazarusidestrconsts:lismenupublishproject msgid "Publish Project" msgstr "" @@ -4050,6 +4076,10 @@ msgstr "" msgid "Revert failed" msgstr "" +#: lazarusidestrconsts:lispkgeditrevertpackage +msgid "Revert package?" +msgstr "" + #: lazarusidestrconsts:srvk_right msgid "Right" msgstr "" @@ -4922,6 +4952,10 @@ msgstr "" msgid "The file %s%s%s%sis already in the package %s." msgstr "" +#: lazarusidestrconsts:lispkgeditthefileiscurrentlynotintheunitpathofthepackage +msgid "The file %s%s%s%sis currently not in the unitpath of the package.%s%sAdd %s%s%s to UnitPath?" +msgstr "" + #: lazarusidestrconsts:listhefileseemstobeaprogramclosecurrentproject msgid "The file %s%s%s%sseems to be a program. Close current project and create a new lazarus project for this program?%sCancel will load the file as normal source." msgstr "" @@ -5822,6 +5856,14 @@ msgstr "Zeig Units" msgid "View watches" msgstr "" +#: lazarusidestrconsts:lispkgfiletypevirtualunit +msgid "Virtual Unit" +msgstr "" + +#: lazarusidestrconsts:lisaf2pisvirtualunit +msgid "Virtual unit (file is not in package)" +msgstr "" + #: lazarusidestrconsts:dlgvisiblegutter msgid "Visible gutter" msgstr "" diff --git a/languages/lazaruside.es.po b/languages/lazaruside.es.po index 0fdd3e839f..054464324f 100644 --- a/languages/lazaruside.es.po +++ b/languages/lazaruside.es.po @@ -370,6 +370,10 @@ msgstr "Acci msgid "Ambigious file found" msgstr "" +#: lazarusidestrconsts:lisambigiousfilefoundthisfilecanbemistakenwithdelete +msgid "Ambigious file found: %s%s%s%sThis file can be mistaken with %s%s%s%s%sDelete the ambigious file?" +msgstr "" + #: lazarusidestrconsts:lisambigiousfilesfound msgid "Ambigious files found" msgstr "" @@ -658,6 +662,10 @@ msgstr "" msgid "Call Stack" msgstr "Llamar Pila" +#: lazarusidestrconsts:liscannotcreatefile +msgid "Can not create file %s%s%s" +msgstr "" + #: lazarusidestrconsts:lispkgsyscannotregistercomponentswithoutunit msgid "Can not register components without unit" msgstr "" @@ -874,8 +882,8 @@ msgstr "" msgid "Command " msgstr "" -#: lazarusidestrconsts:liscommandafterpublishingproject -msgid "Command after publishing project" +#: lazarusidestrconsts:liscommandafterpublishingmodule +msgid "Command after publishing module" msgstr "" #: lazarusidestrconsts:srkmcatcmdcmd @@ -1246,10 +1254,6 @@ msgstr "Demora" msgid "Delete" msgstr "Borrar" -#: lazarusidestrconsts:lisdeleteambigiousfile2 -msgid "Delete ambigious file %s%s%s?" -msgstr "" - #: lazarusidestrconsts:lisdeleteambigiousfile msgid "Delete ambigious file?" msgstr "" @@ -1446,6 +1450,10 @@ msgstr "No separar l msgid "Do not split line In front of:" msgstr "No separar línea delante de:" +#: lazarusidestrconsts:lispkgeditdoyoureallywanttoforgetallchangestopackageand +msgid "Do you really want to forget all changes to package %s and reload it from file?" +msgstr "" + #: lazarusidestrconsts:rsiwpdocked msgid "Docked" msgstr "" @@ -3202,6 +3210,10 @@ msgstr "" msgid "New Unit" msgstr "Nueva Unidad" +#: lazarusidestrconsts:lispkgeditnewunitnotinunitpath +msgid "New unit not in unitpath" +msgstr "" + #: lazarusidestrconsts:liscodetoolsoptsnewline msgid "Newline" msgstr "" @@ -3806,6 +3818,10 @@ msgstr "Preguntar al Reemplazar" msgid "Property completion" msgstr "Completado de Propiedad" +#: lazarusidestrconsts:lispkgeditpublishpackage +msgid "Publish Package" +msgstr "" + #: lazarusidestrconsts:lismenupublishproject msgid "Publish Project" msgstr "Publicar proyecto" @@ -4050,6 +4066,10 @@ msgstr "" msgid "Revert failed" msgstr "" +#: lazarusidestrconsts:lispkgeditrevertpackage +msgid "Revert package?" +msgstr "" + #: lazarusidestrconsts:srvk_right msgid "Right" msgstr "" @@ -4922,6 +4942,10 @@ msgstr "" msgid "The file %s%s%s%sis already in the package %s." msgstr "" +#: lazarusidestrconsts:lispkgeditthefileiscurrentlynotintheunitpathofthepackage +msgid "The file %s%s%s%sis currently not in the unitpath of the package.%s%sAdd %s%s%s to UnitPath?" +msgstr "" + #: lazarusidestrconsts:listhefileseemstobeaprogramclosecurrentproject msgid "The file %s%s%s%sseems to be a program. Close current project and create a new lazarus project for this program?%sCancel will load the file as normal source." msgstr "" @@ -5822,6 +5846,14 @@ msgstr "Ver Unidades" msgid "View watches" msgstr "" +#: lazarusidestrconsts:lispkgfiletypevirtualunit +msgid "Virtual Unit" +msgstr "" + +#: lazarusidestrconsts:lisaf2pisvirtualunit +msgid "Virtual unit (file is not in package)" +msgstr "" + #: lazarusidestrconsts:dlgvisiblegutter msgid "Visible gutter" msgstr "Canal visible" diff --git a/languages/lazaruside.fr.po b/languages/lazaruside.fr.po index 5b069f2388..6400845578 100644 --- a/languages/lazaruside.fr.po +++ b/languages/lazaruside.fr.po @@ -379,6 +379,10 @@ msgstr "Action sur les ambigu msgid "Ambigious file found" msgstr "Ambiguïté de fichier trouvé" +#: lazarusidestrconsts:lisambigiousfilefoundthisfilecanbemistakenwithdelete +msgid "Ambigious file found: %s%s%s%sThis file can be mistaken with %s%s%s%s%sDelete the ambigious file?" +msgstr "" + #: lazarusidestrconsts:lisambigiousfilesfound msgid "Ambigious files found" msgstr "Ambiguïtés des fichiers trouvé" @@ -667,6 +671,10 @@ msgstr "Appel de la proc msgid "Call Stack" msgstr "Pile d'appel" +#: lazarusidestrconsts:liscannotcreatefile +msgid "Can not create file %s%s%s" +msgstr "" + #: lazarusidestrconsts:lispkgsyscannotregistercomponentswithoutunit msgid "Can not register components without unit" msgstr "Ne peut pas référencer des composants sans unité" @@ -883,9 +891,9 @@ msgstr "Virgule" msgid "Command " msgstr "Commande " -#: lazarusidestrconsts:liscommandafterpublishingproject -msgid "Command after publishing project" -msgstr "Commande après la publication d'un projet" +#: lazarusidestrconsts:liscommandafterpublishingmodule +msgid "Command after publishing module" +msgstr "" #: lazarusidestrconsts:srkmcatcmdcmd msgid "Command commands" @@ -1255,10 +1263,6 @@ msgstr "D msgid "Delete" msgstr "Supprime" -#: lazarusidestrconsts:lisdeleteambigiousfile2 -msgid "Delete ambigious file %s%s%s?" -msgstr "Suprimer les ambiguités de fichier %s%s%s ?" - #: lazarusidestrconsts:lisdeleteambigiousfile msgid "Delete ambigious file?" msgstr "Suprimer les ambiguités de fichier ?" @@ -1455,6 +1459,10 @@ msgstr "Pas de ligne de s msgid "Do not split line In front of:" msgstr "Pas de ligne de séparation devant " +#: lazarusidestrconsts:lispkgeditdoyoureallywanttoforgetallchangestopackageand +msgid "Do you really want to forget all changes to package %s and reload it from file?" +msgstr "" + #: lazarusidestrconsts:rsiwpdocked msgid "Docked" msgstr "Attaché" @@ -3211,6 +3219,10 @@ msgstr "" msgid "New Unit" msgstr "Nouvelle unité" +#: lazarusidestrconsts:lispkgeditnewunitnotinunitpath +msgid "New unit not in unitpath" +msgstr "" + #: lazarusidestrconsts:liscodetoolsoptsnewline msgid "Newline" msgstr "Nouvelle_ligne" @@ -3815,6 +3827,10 @@ msgstr "Confirmer le remplacement" msgid "Property completion" msgstr "Propriété d'achèvement" +#: lazarusidestrconsts:lispkgeditpublishpackage +msgid "Publish Package" +msgstr "" + #: lazarusidestrconsts:lismenupublishproject msgid "Publish Project" msgstr "Publier le projet" @@ -4059,6 +4075,10 @@ msgstr "" msgid "Revert failed" msgstr "" +#: lazarusidestrconsts:lispkgeditrevertpackage +msgid "Revert package?" +msgstr "" + #: lazarusidestrconsts:srvk_right msgid "Right" msgstr "Droite" @@ -4931,6 +4951,10 @@ msgstr "" msgid "The file %s%s%s%sis already in the package %s." msgstr "" +#: lazarusidestrconsts:lispkgeditthefileiscurrentlynotintheunitpathofthepackage +msgid "The file %s%s%s%sis currently not in the unitpath of the package.%s%sAdd %s%s%s to UnitPath?" +msgstr "" + #: lazarusidestrconsts:listhefileseemstobeaprogramclosecurrentproject msgid "The file %s%s%s%sseems to be a program. Close current project and create a new lazarus project for this program?%sCancel will load the file as normal source." msgstr "" @@ -5831,6 +5855,14 @@ msgstr "Voir les unit msgid "View watches" msgstr "Voir points de suivi" +#: lazarusidestrconsts:lispkgfiletypevirtualunit +msgid "Virtual Unit" +msgstr "" + +#: lazarusidestrconsts:lisaf2pisvirtualunit +msgid "Virtual unit (file is not in package)" +msgstr "" + #: lazarusidestrconsts:dlgvisiblegutter msgid "Visible gutter" msgstr "Gouttière visible" diff --git a/languages/lazaruside.po b/languages/lazaruside.po index 7aa5cde405..633e6143c8 100644 --- a/languages/lazaruside.po +++ b/languages/lazaruside.po @@ -194,6 +194,10 @@ msgstr "" msgid "Revert" msgstr "" +#: lazarusidestrconsts:lispkgeditpublishpackage +msgid "Publish Package" +msgstr "" + #: lazarusidestrconsts:lismenuopenrecent msgid "Open Recent" msgstr "" @@ -902,8 +906,8 @@ msgstr "" msgid "Unable to clean up %s%s%s.%sPlease check permissions." msgstr "" -#: lazarusidestrconsts:liscommandafterpublishingproject -msgid "Command after publishing project" +#: lazarusidestrconsts:liscommandafterpublishingmodule +msgid "Command after publishing module" msgstr "" #: lazarusidestrconsts:lisunabletoaddtoprojectbecausethereisalreadyaunitwith @@ -1014,8 +1018,8 @@ msgstr "" msgid "Delete ambigious file?" msgstr "" -#: lazarusidestrconsts:lisdeleteambigiousfile2 -msgid "Delete ambigious file %s%s%s?" +#: lazarusidestrconsts:lisambigiousfilefoundthisfilecanbemistakenwithdelete +msgid "Ambigious file found: %s%s%s%sThis file can be mistaken with %s%s%s%s%sDelete the ambigious file?" msgstr "" #: lazarusidestrconsts:lislazaruseditorv @@ -4426,6 +4430,10 @@ msgstr "" msgid "Unit" msgstr "" +#: lazarusidestrconsts:lispkgfiletypevirtualunit +msgid "Virtual Unit" +msgstr "" + #: lazarusidestrconsts:lispkgfiletypelfm msgid "LFM - Lazarus form text" msgstr "" @@ -4710,6 +4718,10 @@ msgstr "" msgid "Unable to create file" msgstr "" +#: lazarusidestrconsts:liscannotcreatefile +msgid "Can not create file %s%s%s" +msgstr "" + #: lazarusidestrconsts:lisunabletocreatefilename msgid "Unable to create file %s%s%s." msgstr "" @@ -5578,6 +5590,10 @@ msgstr "" msgid "Has Register procedure" msgstr "" +#: lazarusidestrconsts:lisaf2pisvirtualunit +msgid "Virtual unit (file is not in package)" +msgstr "" + #: lazarusidestrconsts:lisaf2pfiletype msgid "File Type" msgstr "" @@ -6102,6 +6118,22 @@ msgstr "" msgid "Modified: %s" msgstr "" +#: lazarusidestrconsts:lispkgeditnewunitnotinunitpath +msgid "New unit not in unitpath" +msgstr "" + +#: lazarusidestrconsts:lispkgeditthefileiscurrentlynotintheunitpathofthepackage +msgid "The file %s%s%s%sis currently not in the unitpath of the package.%s%sAdd %s%s%s to UnitPath?" +msgstr "" + +#: lazarusidestrconsts:lispkgeditrevertpackage +msgid "Revert package?" +msgstr "" + +#: lazarusidestrconsts:lispkgeditdoyoureallywanttoforgetallchangestopackageand +msgid "Do you really want to forget all changes to package %s and reload it from file?" +msgstr "" + #: lazarusidestrconsts:lispckoptsusage msgid "Usage" msgstr "" diff --git a/languages/lazaruside.ru.po b/languages/lazaruside.ru.po index 504c7b1b4f..a2b7904b93 100644 --- a/languages/lazaruside.ru.po +++ b/languages/lazaruside.ru.po @@ -370,6 +370,10 @@ msgstr " msgid "Ambigious file found" msgstr "" +#: lazarusidestrconsts:lisambigiousfilefoundthisfilecanbemistakenwithdelete +msgid "Ambigious file found: %s%s%s%sThis file can be mistaken with %s%s%s%s%sDelete the ambigious file?" +msgstr "" + #: lazarusidestrconsts:lisambigiousfilesfound msgid "Ambigious files found" msgstr "" @@ -658,6 +662,10 @@ msgstr "" msgid "Call Stack" msgstr "óÔÅË ×ÙÚÏ×Ï×" +#: lazarusidestrconsts:liscannotcreatefile +msgid "Can not create file %s%s%s" +msgstr "" + #: lazarusidestrconsts:lispkgsyscannotregistercomponentswithoutunit msgid "Can not register components without unit" msgstr "" @@ -874,8 +882,8 @@ msgstr " msgid "Command " msgstr "ëÏÍÁÎÄÁ" -#: lazarusidestrconsts:liscommandafterpublishingproject -msgid "Command after publishing project" +#: lazarusidestrconsts:liscommandafterpublishingmodule +msgid "Command after publishing module" msgstr "" #: lazarusidestrconsts:srkmcatcmdcmd @@ -1246,10 +1254,6 @@ msgstr " msgid "Delete" msgstr "õÄÁÌÉÔØ" -#: lazarusidestrconsts:lisdeleteambigiousfile2 -msgid "Delete ambigious file %s%s%s?" -msgstr "" - #: lazarusidestrconsts:lisdeleteambigiousfile msgid "Delete ambigious file?" msgstr "" @@ -1446,6 +1450,10 @@ msgstr " msgid "Do not split line In front of:" msgstr "îÅ ÒÁÚÒÙ×ÁÔØ ÓÔÒÏËÕ ÐÅÒÅÄ:" +#: lazarusidestrconsts:lispkgeditdoyoureallywanttoforgetallchangestopackageand +msgid "Do you really want to forget all changes to package %s and reload it from file?" +msgstr "" + #: lazarusidestrconsts:rsiwpdocked msgid "Docked" msgstr "ðÒÉËÒÅÐÌ£Î" @@ -3202,6 +3210,10 @@ msgstr "" msgid "New Unit" msgstr "óÏÚÄÁÔØ ÍÏÄÕÌØ" +#: lazarusidestrconsts:lispkgeditnewunitnotinunitpath +msgid "New unit not in unitpath" +msgstr "" + #: lazarusidestrconsts:liscodetoolsoptsnewline msgid "Newline" msgstr "îÏ×ÁÑ ÓÔÒÏËÁ" @@ -3806,6 +3818,10 @@ msgstr " msgid "Property completion" msgstr "úÁ×ÅÒÛÅÎÉÅ Ó×ÏÊÓÔ×" +#: lazarusidestrconsts:lispkgeditpublishpackage +msgid "Publish Package" +msgstr "" + #: lazarusidestrconsts:lismenupublishproject msgid "Publish Project" msgstr "ïÐÕÂÌÉËÏ×ÁÔØ ÐÒÏÅËÔ" @@ -4050,6 +4066,10 @@ msgstr "" msgid "Revert failed" msgstr "" +#: lazarusidestrconsts:lispkgeditrevertpackage +msgid "Revert package?" +msgstr "" + #: lazarusidestrconsts:srvk_right msgid "Right" msgstr "óÐÒÁ×Á" @@ -4922,6 +4942,10 @@ msgstr "" msgid "The file %s%s%s%sis already in the package %s." msgstr "" +#: lazarusidestrconsts:lispkgeditthefileiscurrentlynotintheunitpathofthepackage +msgid "The file %s%s%s%sis currently not in the unitpath of the package.%s%sAdd %s%s%s to UnitPath?" +msgstr "" + #: lazarusidestrconsts:listhefileseemstobeaprogramclosecurrentproject msgid "The file %s%s%s%sseems to be a program. Close current project and create a new lazarus project for this program?%sCancel will load the file as normal source." msgstr "" @@ -5822,6 +5846,14 @@ msgstr " msgid "View watches" msgstr "ðÏËÁÚÁÔØ ÎÁÂÌÀÄÅÎÉÑ" +#: lazarusidestrconsts:lispkgfiletypevirtualunit +msgid "Virtual Unit" +msgstr "" + +#: lazarusidestrconsts:lisaf2pisvirtualunit +msgid "Virtual unit (file is not in package)" +msgstr "" + #: lazarusidestrconsts:dlgvisiblegutter msgid "Visible gutter" msgstr "÷ÉÄÉÍÏÅ ÐÏÌÅ (ÌÅ×)" diff --git a/lcl/include/application.inc b/lcl/include/application.inc index 9456cfe45e..af4b33faa5 100644 --- a/lcl/include/application.inc +++ b/lcl/include/application.inc @@ -207,6 +207,7 @@ end; ------------------------------------------------------------------------------} procedure TApplication.Initialize; begin + // interface object and screen if (InterfaceObject=nil) or (AnsiCompareText(InterfaceObject.Classname,'TINTERFACEBASE')=0) then begin writeln('ERROR: ',rsNoInterfaceObject); @@ -214,6 +215,7 @@ begin end; InterfaceObject.AppInit; CNSendMessage(LM_SCREENINIT, nil, @ScreenInfo); + // application icon if LazarusResources.Find('MAINICON')<>nil then begin if FIcon=nil then begin FIcon:=TIcon.Create; @@ -1003,6 +1005,9 @@ end; { ============================================================================= $Log$ + Revision 1.53 2003/05/18 10:42:58 mattias + implemented deleting empty submenus + Revision 1.52 2003/04/29 19:00:43 mattias added package gtkopengl diff --git a/lcl/include/menuitem.inc b/lcl/include/menuitem.inc index f2ebc6fcf8..80da4ed405 100644 --- a/lcl/include/menuitem.inc +++ b/lcl/include/menuitem.inc @@ -790,18 +790,17 @@ end; ------------------------------------------------------------------------------} Procedure TMenuItem.SetParentComponent(AValue : TComponent); begin - if assigned (FParent) and (FParent = AValue) - then exit; + if (FParent = AValue) then exit; - if assigned (FParent) and (FParent <> AValue) - then TMenuItem (FParent).Remove (self); + if Assigned(FParent) then + FParent.Remove(Self); if assigned (AValue) then begin if (AValue is TMenu) - then TMenu (AValue).Items.Add (Self) + then TMenu(AValue).Items.Add(Self) else if (AValue is TMenuItem) - then TMenuItem (AValue).Add (Self) + then TMenuItem(AValue).Add(Self) else raise Exception.Create('TMenuItem.SetParentComponent: suggestet parent not of type TMenu or TMenuItem'); end; @@ -954,6 +953,9 @@ end; { ============================================================================= $Log$ + Revision 1.34 2003/05/18 10:42:58 mattias + implemented deleting empty submenus + Revision 1.33 2003/04/19 18:37:58 mattias implemented adding OnClick, when clicking on designer menuitem @@ -1081,6 +1083,9 @@ end; $Log$ + Revision 1.34 2003/05/18 10:42:58 mattias + implemented deleting empty submenus + Revision 1.33 2003/04/19 18:37:58 mattias implemented adding OnClick, when clicking on designer menuitem