diff --git a/applications/iconeditor/aboutdialog.pas b/applications/iconeditor/aboutdialog.pas index 1c65fb76c..07914f8bb 100644 --- a/applications/iconeditor/aboutdialog.pas +++ b/applications/iconeditor/aboutdialog.pas @@ -53,12 +53,16 @@ var AboutDialogForm: TAboutDialogForm; implementation - +uses IconStrConsts; { TAboutDialogForm } procedure TAboutDialogForm.FormCreate(Sender: TObject); begin Image.Picture.LoadFromFile('..\..\Images\icon.png'); + Caption:=lieAbouDialog; + LabelVersion.Caption:=lieLabelVersion; + LabelAuthor.Caption:=lieLabelAuthor; + ButtonClose.Caption:=lieButtonClose; end; initialization @@ -66,3 +70,4 @@ initialization end. + diff --git a/applications/iconeditor/iconstrconsts.pas b/applications/iconeditor/iconstrconsts.pas index 0504d7346..f18e707ef 100644 --- a/applications/iconeditor/iconstrconsts.pas +++ b/applications/iconeditor/iconstrconsts.pas @@ -36,22 +36,153 @@ uses Classes, SysUtils; resourcestring + + // standard Buttons + lieButtonClose = 'Close'; + lieButtonOK = 'OK'; + lieButtonCancel = 'Cancel'; + //Messages lieSaveChanges = 'Save changes to %s?'; + lieNew = 'New'; + lieSetResource = 'Set resource name'; + lieResourceName = 'Resource name: '; + // Main Form + lieMain = 'Lazarus Icon Editor'; // main bar menu lieMenuFile = '&File'; lieMenuEdit = '&Edit'; lieMenuPicture = '&Picture'; - lieMenuMask = '&Mask'; - lieMenuView = '&View'; + lieMenuMask = 'Mask'; + lieMenuView = 'View'; lieMenuHelp = '&Help'; // Action Lists lieFileNew = '&New...'; + lieFileOpen = '&Open...'; + lieFileSave = '&Save'; + lieFileSaveAs = 'Save &As...'; + lieFileExportAsLRS = '&Export As *.lrs...'; + lieFileClose = '&Close'; + lieRotate90 = '90° Clockwise'; + lieRotate180 = '180° Clockwise'; + lieRotate270 = '270° Clockwise'; + lieRotateCustom = 'Custom...'; + lieFlipVertically = 'Vertically'; + lieFlipHorizontally = 'Horizontally'; + liePictureResizePaper = 'Resize Paper...'; + liePictureResize = 'Resize...'; + lieColorsGrayscale = 'Grayscale'; + lieColorsInvert = 'Invert'; + lieColorsDisable = 'Disable'; + lieViewShowPreview = 'Show Preview'; + lieViewShowMask = 'Show Mask'; + lieViewShowGrid = 'Show Grid'; + lieMaskInvert = 'Invert'; + lieMaskRemove = 'Remove'; + lieEditCopy = '&Copy'; + lieEditCut = 'Cu&t'; + lieEditDelete = '&Delete'; + lieEditPaste = '&Paste'; + lieEditRedo = '&Redo'; + lieEditSelectAll = 'Select &All'; + lieEditUndo = '&Undo'; + // hints For Actions list + lieHintFileNew = 'New'; + lieHintFileOpen = 'Open'; + lieHintFileSave = 'Save'; + lieHintFileSaveAs = 'Save As'; + lieHintFileExportAsLRS = 'Export As *.lrs'; + lieHintFileClose = 'Close'; + lieHintRotate90 = '90° Clockwise'; + lieHintRotate180 = '180° Clockwise'; + lieHintRotate270 = '270° Clockwise'; + lieHintRotateCustom = 'Custom'; + lieHintFlipVertically = 'Vertically'; + lieHintFlipHorizontally = 'Horizontally'; + lieHintPictureResizePaper = 'Resize Paper'; + lieHintPictureResize = 'Resize'; + lieHintColorsGrayscale = 'Grayscale'; + lieHintColorsInvert = 'Invert'; + lieHintColorsDisable = 'Disable'; + lieHintViewShowPreview = 'Show Preview'; + lieHintViewShowMask = 'Show Mask'; + lieHintViewShowGrid = 'Show Grid'; + lieHintMaskInvert = 'Invert'; + lieHintMaskRemove = 'Remove'; + lieHintEditCopy = 'Copy'; + lieHintEditCut = 'Cut'; + lieHintEditDelete = 'Delete'; + lieHintEditPaste = 'Paste'; + lieHintEditRedo = 'Redo'; + lieHintEditSelectAll = 'Select All'; + lieHintEditUndo = 'Undo'; + + // Hints for Tools + lieHintToolSpray = 'Spray'; + lieHintToolFloodFill = 'Flood Fill'; + lieHintToolEraser = 'Eraser/Replacer'; + lieHintToolPen = 'Pen'; + lieHintToolColorPick = 'Color Pick'; + lieHintToolMask = 'Mask'; + lieHintToolLine = 'Line'; + lieHintToolPolygon = 'Polygon'; + lieHintToolEllipse = 'Ellipse'; + lieHintToolRectangle = 'Rectangle/Round rectangle'; + + //Labels + lieLabelZoom = 'Zoom:'; + lieLabelShape = 'Shape:'; + lieLabelFillOutline = 'Fill, Outline:'; + lieLabelMaskTool = 'Mask Tool:'; + lieLabelOutline = 'Outline:'; + lieLabelFill = 'Fill:'; + lieLabelPaper = 'Paper:'; + lieLabelSize = 'Size:'; + lieLabelRoundness = 'Roundness:'; + lieLabelDensity = 'Density:'; + lieLabelTolerance = 'Tolerance:'; + + // Dialog About + lieAbouDialog = 'About Lazarus Icon Editor'; + lieLabelVersion = 'Version: 0.1'; + lieLabelAuthor = 'Author: Tom Gregorovic'; + + // Dialog New + lieNewDialog = 'New picture'; + lieLabelWidth = 'Width:'; + lieLabelHeight = 'Height:'; + lieLabelPaperColor = 'Paper color:'; + lieColorButtonPaper = 'Change...'; + + // Dialog Preview + liePreviewDialog = 'Preview'; + + // Dialog Resize + lieResizeDialog = 'Resize picture'; + lieGroupBoxProperties = 'Properties'; + lieLabelNewWidth = 'New width:'; + lieLabelNewHeight = 'New height:'; + lieCheckBoxAspectRatio = 'Preserve aspect ratio'; + lieGroupBoxStretchMethod = 'Stretch method'; + lieRadioButtonTruncate = 'Truncate'; + lieRadioButtonSmooth = 'Smooth:'; + // Todo lieComboBoxSmooth = 'Area pixel'; + + // Dialog Resize Paper + lielieResizePaperDialog = 'Resize paper'; + lieLabelPicturePosition = 'Picture position:'; + lieLabelPaperWidth = 'Paper width:'; + lieLabelPaperHeight = 'Paper height:'; +// lieCheckBoxAspectRatio = 'Preserve aspect ratio'; in dialog Resize +// lieLabelPaperColor = 'Paper color:'; in dialog New +// lieColorButtonPaper = 'Change...'; in dialog New + // Todo lieComboBoxPicturePosition = ''; implementation end. + diff --git a/applications/iconeditor/laziconeditor.lpi b/applications/iconeditor/laziconeditor.lpi index 472827ed5..8193db47c 100644 --- a/applications/iconeditor/laziconeditor.lpi +++ b/applications/iconeditor/laziconeditor.lpi @@ -8,7 +8,7 @@ - <ActiveEditorIndexAtStart Value="2"/> + <ActiveEditorIndexAtStart Value="5"/> </General> <VersionInfo> <CurrentMajorRevNr Value="1"/> @@ -77,8 +77,8 @@ <IsPartOfProject Value="True"/> <ResourceFilename Value="preview.lrs"/> <UnitName Value="Preview"/> - <CursorPos X="37" Y="38"/> - <TopLine Value="15"/> + <CursorPos X="22" Y="55"/> + <TopLine Value="38"/> <EditorIndex Value="5"/> <UsageCount Value="146"/> <Loaded Value="True"/> diff --git a/applications/iconeditor/main.pas b/applications/iconeditor/main.pas index 7c0fec697..436d878e5 100644 --- a/applications/iconeditor/main.pas +++ b/applications/iconeditor/main.pas @@ -830,13 +830,101 @@ begin Palette.LoadPalette('../../default.pal'); + Caption:=lieMain; + // Menus MenuItemFile.Caption := lieMenuFile; MenuItemEdit.Caption := lieMenuEdit; MenuItemPicture.Caption := lieMenuPicture; MenuItemMask.Caption := lieMenuMask; MenuItemView.Caption := lieMenuView; MenuItemHelp.Caption := lieMenuHelp; + + // Actions FileNew.Caption := lieFileNew; + FileOpen.Caption:=lieFileOpen; + FileSave.Caption:=lieFileSave; + FileSaveAs.Caption:=lieFileSaveAs; + FileExportAsLRS.Caption:=lieFileExportAsLRS; + FileClose.Caption:=lieFileClose; + Rotate90.Caption:=lieRotate90; + Rotate180.Caption:=lieRotate180; + Rotate270.Caption:=lieRotate270; + RotateCustom.Caption:=lieRotateCustom; + FlipVertically.Caption:=lieFlipVertically; + FlipHorizontally.Caption:=lieFlipHorizontally; + PictureResizePaper.Caption:=liePictureResizePaper; + PictureResize.Caption:=liePictureResize; + ColorsGrayscale.Caption:=lieColorsGrayscale; + ColorsInvert.Caption:=lieColorsInvert; + ColorsDisable.Caption:=lieColorsDisable; + ViewShowPreview.Caption:=lieViewShowPreview; + ViewShowMask.Caption:=lieViewShowMask; + ViewShowGrid.Caption:=lieViewShowGrid; + MaskInvert.Caption:=lieMaskInvert; + MaskRemove.Caption:=lieMaskRemove; + EditCopy.Caption:=lieEditCopy; + EditCut.Caption:=lieEditCut; + EditDelete.Caption:=lieEditDelete; + EditPaste.Caption:=lieEditPaste; + EditRedo.Caption:=lieEditRedo; + EditSelectAll.Caption:=lieEditSelectAll; + EditUndo.Caption:=lieEditUndo; + + // Hints for Actions + FileNew.Hint := lieHintFileNew; + FileOpen.Hint:=lieHintFileOpen; + FileSave.Hint:=lieHintFileSave; + FileSaveAs.Hint:=lieHintFileSaveAs; + FileExportAsLRS.Hint:=lieHintFileExportAsLRS; + FileClose.Hint:=lieHintFileClose; + Rotate90.Hint:=lieHintRotate90; + Rotate180.Hint:=lieHintRotate180; + Rotate270.Hint:=lieHintRotate270; + RotateCustom.Hint:=lieHintRotateCustom; + FlipVertically.Hint:=lieHintFlipVertically; + FlipHorizontally.Hint:=lieHintFlipHorizontally; + PictureResizePaper.Hint:=lieHintPictureResizePaper; + PictureResize.Hint:=lieHintPictureResize; + ColorsGrayscale.Hint:=lieHintColorsGrayscale; + ColorsInvert.Hint:=lieHintColorsInvert; + ColorsDisable.Hint:=lieHintColorsDisable; + ViewShowPreview.Hint:=lieHintViewShowPreview; + ViewShowMask.Hint:=lieHintViewShowMask; + ViewShowGrid.Hint:=lieHintViewShowGrid; + MaskInvert.Hint:=lieHintMaskInvert; + MaskRemove.Hint:=lieHintMaskRemove; + EditCopy.Hint:=lieHintEditCopy; + EditCut.Hint:=lieHintEditCut; + EditDelete.Hint:=lieHintEditDelete; + EditPaste.Hint:=lieHintEditPaste; + EditRedo.Hint:=lieHintEditRedo; + EditSelectAll.Hint:=lieHintEditSelectAll; + EditUndo.Hint:=lieHintEditUndo; + + //Labels + LabelZoom.Caption:=lieLabelZoom; + LabelShape.Caption:=lieLabelShape; + LabelFillOutline.Caption:=lieLabelFillOutline; + LabelMaskTool.Caption:=lieLabelMaskTool; + LabelOutline.Caption:=lieLabelOutline; + LabelFill.Caption:=lieLabelFill; + LabelPaper.Caption:=lieLabelPaper; + LabelSize.Caption:=lieLabelSize; + LabelRoundness.Caption:=lieLabelRoundness; + LabelDensity.Caption:=lieLabelDensity; + LabelTolerance.Caption:=lieLabelTolerance; + + //Hints for Tools + ToolSpray.Hint:=lieHintToolSpray; + ToolFloodFill.Hint:=lieHintToolFloodFill; + ToolEraser.Hint:=lieHintToolEraser; + ToolPen.Hint:=lieHintToolPen; + ToolColorPick.Hint:=lieHintToolColorPick; + ToolMask.Hint:=lieHintToolMask; + ToolLine.Hint:=lieHintToolLine; + ToolPolygon.Hint:=lieHintToolPolygon; + ToolEllipse.Hint:=lieHintToolEllipse; + ToolRectangle.Hint:=lieHintToolRectangle; end; procedure TMainForm.FormShow(Sender: TObject); @@ -911,7 +999,7 @@ begin begin Value := ExtractFileName(ExportResourceDialog.FileName); Value := Copy(Value, 1, Length(Value) - Length(ExtractFileExt(Value))); - if InputQuery('Set resource name', 'Resource name: ', Value) then + if InputQuery(lieSetResource, lieResourceName, Value) then begin Pictures.ExportAsLazarusResource(ExportResourceDialog.FileName, Value); end; @@ -1047,3 +1135,4 @@ initialization end. + diff --git a/applications/iconeditor/picturemanager.pas b/applications/iconeditor/picturemanager.pas index afc04a223..ab2fa376c 100644 --- a/applications/iconeditor/picturemanager.pas +++ b/applications/iconeditor/picturemanager.pas @@ -113,7 +113,7 @@ type implementation - +uses IconStrConsts; { TPictureManager } function TPictureManager.FindNewUniqueName: String; @@ -128,7 +128,7 @@ begin Exists := False; for J := 0 to Pred(PageCount) do begin - if Pages[J].Caption = 'New' + IntToStr(I) then + if Pages[J].Caption = lieNew + IntToStr(I) then begin Inc(I); Exists := True; @@ -138,7 +138,7 @@ begin if not Exists then Break; end; - Result := 'New' + IntToStr(I); + Result := lieNew + IntToStr(I); end; function TPictureManager.GetActivePicturePage: TPicturePage; @@ -397,3 +397,4 @@ end; end. + diff --git a/applications/iconeditor/preview.lrs b/applications/iconeditor/preview.lrs index c66f6514a..e09d315cc 100644 --- a/applications/iconeditor/preview.lrs +++ b/applications/iconeditor/preview.lrs @@ -1,5 +1,3 @@ -{ This is an automatically generated lazarus resource file } - LazarusResources.Add('TPreviewForm','FORMDATA',[ 'TPF0'#12'TPreviewForm'#11'PreviewForm'#4'Left'#3'Q'#3#6'Height'#3#200#0#3'To' +'p'#2'O'#5'Width'#3#200#0#18'HorzScrollBar.Page'#3#199#0#18'VertScrollBar.Pa' diff --git a/applications/iconeditor/preview.pas b/applications/iconeditor/preview.pas index 30ebaf569..59cce885b 100644 --- a/applications/iconeditor/preview.pas +++ b/applications/iconeditor/preview.pas @@ -51,11 +51,12 @@ var View: TPictureView; implementation -uses main; + +uses Main, IconStrConsts; + { TPreviewForm } -procedure TPreviewForm.FormClose(Sender: TObject; var CloseAction: TCloseAction - ); +procedure TPreviewForm.FormClose(Sender: TObject; var CloseAction: TCloseAction); begin MainForm.ViewShowPreview.Checked:=False; end; @@ -68,6 +69,8 @@ begin View.Parent := Self; Left := Screen.Width - Width - 10; + + Caption:=liePreviewDialog; end; procedure TPreviewForm.Preview(Bitmap: TPictureBitmap); diff --git a/applications/iconeditor/resizepaperdialog.pas b/applications/iconeditor/resizepaperdialog.pas index 74030d35e..a02eb0661 100644 --- a/applications/iconeditor/resizepaperdialog.pas +++ b/applications/iconeditor/resizepaperdialog.pas @@ -75,7 +75,7 @@ var Preview: TPictureEdit; implementation - +uses IconStrConsts; { TResizePaperDialogForm } procedure TResizePaperDialogForm.FormCreate(Sender: TObject); @@ -83,6 +83,18 @@ begin Preview := TPictureEdit.Create(PanelPreview); Preview.Parent := PanelPreview; Preview.Align := alClient; + + Caption:=lielieResizePaperDialog; + LabelPicturePosition.Caption:=lieLabelPicturePosition; + LabelWidth.Caption:=lieLabelPaperWidth; + LabelHeight.Caption:=lieLabelPaperHeight; + CheckBoxAspectRatio.Caption:=lieCheckBoxAspectRatio; + LabelPaperColor.Caption:=lieLabelPaperColor; + ColorButtonPaper.Caption:=lieColorButtonPaper; + ButtonOK.Caption:=lieButtonOK; + ButtonCancel.Caption:=lieButtonCancel; +// Todo ComboBoxPicturePosition + end; procedure TResizePaperDialogForm.EditHeightChange(Sender: TObject); @@ -197,3 +209,4 @@ initialization end. +