diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 4d09c40b12..671d579282 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -3614,6 +3614,7 @@ resourcestring lisVSRSearchOrFilterPhrasesInList = 'Search or Filter Phrases In List'; lisVSRForwardSearch = 'Forward Search'; lisVSRResetResultList = 'Reset Result List'; + lisTDDInsertToDo = 'Insert ToDo'; implementation diff --git a/ide/tododlg.lfm b/ide/tododlg.lfm index c28bb47099..1e2fffb114 100644 --- a/ide/tododlg.lfm +++ b/ide/tododlg.lfm @@ -1,96 +1,142 @@ object TodoDialog: TTodoDialog Left = 342 - Height = 248 + Height = 269 Top = 202 - Width = 483 - HorzScrollBar.Page = 482 - VertScrollBar.Page = 247 - ActiveControl = OkButton + Width = 475 + HorzScrollBar.Page = 474 + VertScrollBar.Page = 268 Caption = 'Insert Todo' - ClientHeight = 248 - ClientWidth = 483 + ClientHeight = 269 + ClientWidth = 475 OnCreate = FormCreate object TodoLabel: TLabel Left = 8 - Height = 14 + Height = 20 Top = 8 - Width = 27 + Width = 30 Caption = 'Text:' FocusControl = TodoMemo ParentColor = False end object PriorityLabel: TLabel + AnchorSideTop.Side = asrBottom + AnchorSideBottom.Control = PriorityEdit Left = 10 - Height = 14 - Top = 167 - Width = 35 + Height = 20 + Top = 173 + Width = 45 + Anchors = [akLeft, akBottom] + BorderSpacing.Bottom = 2 Caption = 'Priority' ParentColor = False end object OwnerLabel: TLabel - Left = 56 - Height = 14 - Top = 168 - Width = 33 + AnchorSideTop.Control = PriorityLabel + Left = 75 + Height = 20 + Top = 173 + Width = 41 Caption = 'Owner' ParentColor = False end object CategoryLabel: TLabel + AnchorSideTop.Control = PriorityLabel Left = 248 - Height = 14 - Top = 168 - Width = 46 + Height = 20 + Top = 173 + Width = 59 Caption = 'Category' ParentColor = False end - object OkButton: TButton - Left = 312 - Height = 25 - Top = 216 - Width = 75 - Caption = 'Ok' - Default = True - ModalResult = 1 - TabOrder = 4 - end - object CancelButton: TButton - Left = 397 - Height = 25 - Top = 216 - Width = 75 - Cancel = True - Caption = 'Cancel' - ModalResult = 2 - TabOrder = 5 - end object TodoMemo: TMemo - Left = 8 - Height = 136 - Top = 24 - Width = 464 + AnchorSideTop.Control = TodoLabel + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = Owner + AnchorSideRight.Side = asrBottom + AnchorSideBottom.Control = PriorityLabel + Left = 6 + Height = 137 + Top = 30 + Width = 463 + Anchors = [akTop, akLeft, akRight, akBottom] + BorderSpacing.Top = 2 + BorderSpacing.Right = 6 + BorderSpacing.Bottom = 6 ScrollBars = ssAutoBoth TabOrder = 0 end object PriorityEdit: TEdit - Left = 8 - Height = 23 - Top = 181 + AnchorSideTop.Side = asrBottom + AnchorSideBottom.Control = BtnPanel + Left = 6 + Height = 27 + Top = 195 Width = 38 + Anchors = [akLeft, akBottom] + AutoSize = True + BorderSpacing.Bottom = 6 OnKeyPress = PriorityEditKeyPress TabOrder = 1 end object OwnerEdit: TEdit - Left = 56 - Height = 23 - Top = 181 - Width = 182 + AnchorSideTop.Control = PriorityEdit + Left = 76 + Height = 27 + Top = 195 + Width = 162 + AutoSize = True TabOrder = 2 end object CategoryEdit: TEdit + AnchorSideTop.Control = PriorityEdit + AnchorSideRight.Control = Owner + AnchorSideRight.Side = asrBottom Left = 248 - Height = 23 - Top = 181 - Width = 224 + Height = 27 + Top = 195 + Width = 221 + Anchors = [akTop, akLeft, akRight] + AutoSize = True + BorderSpacing.Right = 6 TabOrder = 3 end + object BtnPanel: TPanel + Height = 41 + Top = 228 + Width = 475 + Align = alBottom + AutoSize = True + BevelOuter = bvNone + ClientHeight = 41 + ClientWidth = 475 + TabOrder = 4 + object OkButton: TButton + Left = 313 + Height = 29 + Top = 6 + Width = 75 + Align = alRight + AutoSize = True + BorderSpacing.Around = 6 + Caption = 'Ok' + Constraints.MinWidth = 75 + Default = True + ModalResult = 1 + TabOrder = 0 + end + object CancelButton: TButton + Left = 394 + Height = 29 + Top = 6 + Width = 75 + Align = alRight + AutoSize = True + BorderSpacing.Around = 6 + Cancel = True + Caption = 'Cancel' + Constraints.MinWidth = 75 + ModalResult = 2 + TabOrder = 1 + end + end end diff --git a/ide/tododlg.lrs b/ide/tododlg.lrs index 5439c26619..11f4fe5e67 100644 --- a/ide/tododlg.lrs +++ b/ide/tododlg.lrs @@ -1,26 +1,44 @@ { This is an automatically generated lazarus resource file } LazarusResources.Add('TTodoDialog','FORMDATA',[ - 'TPF0'#11'TTodoDialog'#10'TodoDialog'#4'Left'#3'V'#1#6'Height'#3#248#0#3'Top' - +#3#202#0#5'Width'#3#227#1#18'HorzScrollBar.Page'#3#226#1#18'VertScrollBar.Pa' - +'ge'#3#247#0#13'ActiveControl'#7#8'OkButton'#7'Caption'#6#11'Insert Todo'#12 - +'ClientHeight'#3#248#0#11'ClientWidth'#3#227#1#8'OnCreate'#7#10'FormCreate'#0 - +#6'TLabel'#9'TodoLabel'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#8#5'Width'#2#27#7 - +'Caption'#6#5'Text:'#12'FocusControl'#7#8'TodoMemo'#11'ParentColor'#8#0#0#6 - +'TLabel'#13'PriorityLabel'#4'Left'#2#10#6'Height'#2#14#3'Top'#3#167#0#5'Widt' - +'h'#2'#'#7'Caption'#6#8'Priority'#11'ParentColor'#8#0#0#6'TLabel'#10'OwnerLa' - +'bel'#4'Left'#2'8'#6'Height'#2#14#3'Top'#3#168#0#5'Width'#2'!'#7'Caption'#6#5 - +'Owner'#11'ParentColor'#8#0#0#6'TLabel'#13'CategoryLabel'#4'Left'#3#248#0#6 - +'Height'#2#14#3'Top'#3#168#0#5'Width'#2'.'#7'Caption'#6#8'Category'#11'Paren' - +'tColor'#8#0#0#7'TButton'#8'OkButton'#4'Left'#3'8'#1#6'Height'#2#25#3'Top'#3 - +#216#0#5'Width'#2'K'#7'Caption'#6#2'Ok'#7'Default'#9#11'ModalResult'#2#1#8'T' - +'abOrder'#2#4#0#0#7'TButton'#12'CancelButton'#4'Left'#3#141#1#6'Height'#2#25 - +#3'Top'#3#216#0#5'Width'#2'K'#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalRes' - +'ult'#2#2#8'TabOrder'#2#5#0#0#5'TMemo'#8'TodoMemo'#4'Left'#2#8#6'Height'#3 - +#136#0#3'Top'#2#24#5'Width'#3#208#1#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrd' - +'er'#2#0#0#0#5'TEdit'#12'PriorityEdit'#4'Left'#2#8#6'Height'#2#23#3'Top'#3 - +#181#0#5'Width'#2'&'#10'OnKeyPress'#7#20'PriorityEditKeyPress'#8'TabOrder'#2 - +#1#0#0#5'TEdit'#9'OwnerEdit'#4'Left'#2'8'#6'Height'#2#23#3'Top'#3#181#0#5'Wi' - +'dth'#3#182#0#8'TabOrder'#2#2#0#0#5'TEdit'#12'CategoryEdit'#4'Left'#3#248#0#6 - +'Height'#2#23#3'Top'#3#181#0#5'Width'#3#224#0#8'TabOrder'#2#3#0#0#0 + 'TPF0'#11'TTodoDialog'#10'TodoDialog'#4'Left'#3'V'#1#6'Height'#3#13#1#3'Top'#3 + +#202#0#5'Width'#3#219#1#18'HorzScrollBar.Page'#3#218#1#18'VertScrollBar.Page' + +#3#12#1#7'Caption'#6#11'Insert Todo'#12'ClientHeight'#3#13#1#11'ClientWidth' + +#3#219#1#8'OnCreate'#7#10'FormCreate'#0#6'TLabel'#9'TodoLabel'#4'Left'#2#8#6 + +'Height'#2#20#3'Top'#2#8#5'Width'#2#30#7'Caption'#6#5'Text:'#12'FocusControl' + +#7#8'TodoMemo'#11'ParentColor'#8#0#0#6'TLabel'#13'PriorityLabel'#18'AnchorSi' + +'deTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'PriorityEdit'#4 + +'Left'#2#10#6'Height'#2#20#3'Top'#3#173#0#5'Width'#2'-'#7'Anchors'#11#6'akLe' + +'ft'#8'akBottom'#0#20'BorderSpacing.Bottom'#2#2#7'Caption'#6#8'Priority'#11 + +'ParentColor'#8#0#0#6'TLabel'#10'OwnerLabel'#21'AnchorSideTop.Control'#7#13 + +'PriorityLabel'#4'Left'#2'K'#6'Height'#2#20#3'Top'#3#173#0#5'Width'#2')'#7'C' + +'aption'#6#5'Owner'#11'ParentColor'#8#0#0#6'TLabel'#13'CategoryLabel'#21'Anc' + +'horSideTop.Control'#7#13'PriorityLabel'#4'Left'#3#248#0#6'Height'#2#20#3'To' + +'p'#3#173#0#5'Width'#2';'#7'Caption'#6#8'Category'#11'ParentColor'#8#0#0#5'T' + +'Memo'#8'TodoMemo'#21'AnchorSideTop.Control'#7#9'TodoLabel'#18'AnchorSideTop' + +'.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideR' + +'ight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#13'PriorityLabel'#4 + +'Left'#2#6#6'Height'#3#137#0#3'Top'#2#30#5'Width'#3#207#1#7'Anchors'#11#5'ak' + +'Top'#6'akLeft'#7'akRight'#8'akBottom'#0#17'BorderSpacing.Top'#2#2#19'Border' + +'Spacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#10'ScrollBars'#7#10'ssAutoB' + +'oth'#8'TabOrder'#2#0#0#0#5'TEdit'#12'PriorityEdit'#18'AnchorSideTop.Side'#7 + +#9'asrBottom'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#4'Left'#2#6#6'Heigh' + +'t'#2#27#3'Top'#3#195#0#5'Width'#2'&'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8 + +'AutoSize'#9#20'BorderSpacing.Bottom'#2#6#10'OnKeyPress'#7#20'PriorityEditKe' + +'yPress'#8'TabOrder'#2#1#0#0#5'TEdit'#9'OwnerEdit'#21'AnchorSideTop.Control' + +#7#12'PriorityEdit'#4'Left'#2'L'#6'Height'#2#27#3'Top'#3#195#0#5'Width'#3#162 + +#0#8'AutoSize'#9#8'TabOrder'#2#2#0#0#5'TEdit'#12'CategoryEdit'#21'AnchorSide' + +'Top.Control'#7#12'PriorityEdit'#23'AnchorSideRight.Control'#7#5'Owner'#20'A' + +'nchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#248#0#6'Height'#2#27#3'Top'#3 + +#195#0#5'Width'#3#221#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'Auto' + +'Size'#9#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#3#0#0#6'TPanel'#8'BtnPane' + +'l'#6'Height'#2')'#3'Top'#3#228#0#5'Width'#3#219#1#5'Align'#7#8'alBottom'#8 + +'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2')'#11'ClientWidth' + +#3#219#1#8'TabOrder'#2#4#0#7'TButton'#8'OkButton'#4'Left'#3'9'#1#6'Height'#2 + +#29#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSp' + +'acing.Around'#2#6#7'Caption'#6#2'Ok'#20'Constraints.MinWidth'#2'K'#7'Defaul' + +'t'#9#11'ModalResult'#2#1#8'TabOrder'#2#0#0#0#7'TButton'#12'CancelButton'#4 + +'Left'#3#138#1#6'Height'#2#29#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight' + +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cance' + +'l'#20'Constraints.MinWidth'#2'K'#11'ModalResult'#2#2#8'TabOrder'#2#1#0#0#0#0 ]); diff --git a/ide/tododlg.pas b/ide/tododlg.pas index 56a1452180..695940082f 100644 --- a/ide/tododlg.pas +++ b/ide/tododlg.pas @@ -29,7 +29,9 @@ unit ToDoDlg; interface uses - Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, TodoList; + Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, + ExtCtrls, + TodoList, LazarusIDEStrConsts; type @@ -39,6 +41,7 @@ type OwnerEdit: TEdit; CategoryEdit: TEdit; CategoryLabel: TLabel; + BtnPanel: TPanel; PriorityEdit: TEdit; PriorityLabel: TLabel; OwnerLabel: TLabel; @@ -70,6 +73,13 @@ end; procedure TTodoDialog.FormCreate(Sender: TObject); begin ActiveControl:=TodoMemo; + Caption:=lisTDDInsertToDo; + TodoLabel.Caption:=lisPkgFileTypeText; + PriorityLabel.Caption:=lisToDoLPriority; + OwnerLabel.Caption:=lisToDoLOwner; + CategoryLabel.Caption:=listToDoLCategory; + OkButton.Caption:=lisOkBtn; + CancelButton.Caption:=dlgCancel; end; function ExecuteTodoDialog: TTodoItem; diff --git a/ide/todolist.lfm b/ide/todolist.lfm index 6f46161840..5f0a174bb2 100644 --- a/ide/todolist.lfm +++ b/ide/todolist.lfm @@ -14,13 +14,13 @@ object frmTodo: TfrmTodo OnKeyDown = FormKeyDown Position = poScreenCenter object StatusBar: TStatusBar - Height = 23 - Top = 277 + Height = 21 + Top = 279 Width = 643 Panels = <> end object lvTodo: TListView - Height = 229 + Height = 231 Top = 48 Width = 643 Align = alClient @@ -28,22 +28,22 @@ object frmTodo: TfrmTodo item AutoSize = True Caption = 'Caption' - Width = 40 + Width = 59 end item AutoSize = True Caption = 'Caption' - Width = 100 + Width = 59 end item AutoSize = True Caption = 'Caption' - Width = 40 + Width = 59 end item AutoSize = True Caption = 'Caption' - Width = 100 + Width = 59 end item Caption = 'Caption' @@ -53,6 +53,7 @@ object frmTodo: TfrmTodo end item Caption = 'Caption' + Width = 307 end> RowSelect = True ScrollBars = ssAutoBoth @@ -73,7 +74,7 @@ object frmTodo: TfrmTodo ShowHint = True TabOrder = 1 object tbOptions: TToolButton - Left = 108 + Left = 132 Top = 2 AllowAllUp = True AutoSize = True @@ -81,7 +82,7 @@ object frmTodo: TfrmTodo Visible = False end object tbPrint: TToolButton - Left = 78 + Left = 95 Top = 2 AutoSize = True Caption = 'Print' @@ -94,7 +95,7 @@ object frmTodo: TfrmTodo AutoSize = True end object tbGoto: TToolButton - Left = 47 + Left = 56 Top = 2 Action = acGoto AutoSize = True diff --git a/ide/todolist.lrs b/ide/todolist.lrs index 595cf0f437..a02d464708 100644 --- a/ide/todolist.lrs +++ b/ide/todolist.lrs @@ -6,25 +6,25 @@ LazarusResources.Add('TfrmTodo','FORMDATA',[ +#1#13'ActiveControl'#7#6'lvTodo'#7'Caption'#6#7'frmTodo'#12'ClientHeight'#3 +','#1#11'ClientWidth'#3#131#2#10'KeyPreview'#9#8'OnCreate'#7#10'FormCreate'#9 +'OnKeyDown'#7#11'FormKeyDown'#8'Position'#7#14'poScreenCenter'#0#10'TStatusB' - +'ar'#9'StatusBar'#6'Height'#2#23#3'Top'#3#21#1#5'Width'#3#131#2#6'Panels'#14 - +#0#0#0#9'TListView'#6'lvTodo'#6'Height'#3#229#0#3'Top'#2'0'#5'Width'#3#131#2 + +'ar'#9'StatusBar'#6'Height'#2#21#3'Top'#3#23#1#5'Width'#3#131#2#6'Panels'#14 + +#0#0#0#9'TListView'#6'lvTodo'#6'Height'#3#231#0#3'Top'#2'0'#5'Width'#3#131#2 +#5'Align'#7#8'alClient'#7'Columns'#14#1#8'AutoSize'#9#7'Caption'#6#7'Caption' - +#5'Width'#2'('#0#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2'd'#0#1#8 - +'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2'('#0#1#8'AutoSize'#9#7'Capti' - +'on'#6#7'Caption'#5'Width'#2'd'#0#1#7'Caption'#6#7'Caption'#0#1#7'Caption'#6 - +#7'Caption'#0#1#7'Caption'#6#7'Caption'#0#0#9'RowSelect'#9#10'ScrollBars'#7 - +#10'ssAutoBoth'#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#7'OnClick'#7#11'l' - +'vTodoClick'#0#0#8'TToolBar'#7'ToolBar'#6'Height'#2'0'#5'Width'#3#131#2#8'Au' - +'toSize'#9#12'ButtonHeight'#2'.'#11'ButtonWidth'#2'/'#7'Caption'#6#7'ToolBar' - +#4'Flat'#9#14'ParentShowHint'#8#12'ShowCaptions'#9#8'ShowHint'#9#8'TabOrder' - +#2#1#0#11'TToolButton'#9'tbOptions'#4'Left'#2'l'#3'Top'#2#2#10'AllowAllUp'#9 - +#8'AutoSize'#9#7'Caption'#6#7'Options'#7'Visible'#8#0#0#11'TToolButton'#7'tb' - +'Print'#4'Left'#2'N'#3'Top'#2#2#8'AutoSize'#9#7'Caption'#6#5'Print'#7'Visibl' - +'e'#8#0#0#11'TToolButton'#9'tbRefresh'#4'Left'#2#1#3'Top'#2#2#6'Action'#7#9 - +'acRefresh'#8'AutoSize'#9#0#0#11'TToolButton'#6'tbGoto'#4'Left'#2'/'#3'Top'#2 - +#2#6'Action'#7#6'acGoto'#8'AutoSize'#9#0#0#0#11'TActionList'#10'ActionList'#4 - +'left'#3#158#1#3'top'#2#11#0#7'TAction'#6'acGoto'#7'Caption'#6#4'Goto'#18'Di' - +'sableIfNoHandler'#9#9'OnExecute'#7#13'acGotoExecute'#0#0#7'TAction'#9'acRef' - +'resh'#7'Caption'#6#7'Refresh'#18'DisableIfNoHandler'#9#9'OnExecute'#7#16'ac' - +'RefreshExecute'#0#0#0#0 + +#5'Width'#2';'#0#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2';'#0#1#8 + +'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2';'#0#1#8'AutoSize'#9#7'Capti' + +'on'#6#7'Caption'#5'Width'#2';'#0#1#7'Caption'#6#7'Caption'#0#1#7'Caption'#6 + +#7'Caption'#0#1#7'Caption'#6#7'Caption'#5'Width'#3'3'#1#0#0#9'RowSelect'#9#10 + +'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#7'O' + +'nClick'#7#11'lvTodoClick'#0#0#8'TToolBar'#7'ToolBar'#6'Height'#2'0'#5'Width' + +#3#131#2#8'AutoSize'#9#12'ButtonHeight'#2'.'#11'ButtonWidth'#2'/'#7'Caption' + +#6#7'ToolBar'#4'Flat'#9#14'ParentShowHint'#8#12'ShowCaptions'#9#8'ShowHint'#9 + +#8'TabOrder'#2#1#0#11'TToolButton'#9'tbOptions'#4'Left'#3#132#0#3'Top'#2#2#10 + +'AllowAllUp'#9#8'AutoSize'#9#7'Caption'#6#7'Options'#7'Visible'#8#0#0#11'TTo' + +'olButton'#7'tbPrint'#4'Left'#2'_'#3'Top'#2#2#8'AutoSize'#9#7'Caption'#6#5'P' + +'rint'#7'Visible'#8#0#0#11'TToolButton'#9'tbRefresh'#4'Left'#2#1#3'Top'#2#2#6 + +'Action'#7#9'acRefresh'#8'AutoSize'#9#0#0#11'TToolButton'#6'tbGoto'#4'Left'#2 + +'8'#3'Top'#2#2#6'Action'#7#6'acGoto'#8'AutoSize'#9#0#0#0#11'TActionList'#10 + +'ActionList'#4'left'#3#158#1#3'top'#2#11#0#7'TAction'#6'acGoto'#7'Caption'#6 + +#4'Goto'#18'DisableIfNoHandler'#9#9'OnExecute'#7#13'acGotoExecute'#0#0#7'TAc' + +'tion'#9'acRefresh'#7'Caption'#6#7'Refresh'#18'DisableIfNoHandler'#9#9'OnExe' + +'cute'#7#16'acRefreshExecute'#0#0#0#0 ]); diff --git a/ide/todolist.pas b/ide/todolist.pas index a84bee2c31..8d8b037cf5 100644 --- a/ide/todolist.pas +++ b/ide/todolist.pas @@ -377,7 +377,7 @@ begin with lvTodo do begin - Column[0].Caption := 'Done'; + Column[0].Caption := lisToDoLDone; Column[0].Width := 45; Column[1].Caption := lisToDoLDescription; Column[1].Width := 150; diff --git a/localize.sh b/localize.sh index 365b6d6534..8431fdba68 100755 --- a/localize.sh +++ b/localize.sh @@ -11,7 +11,7 @@ # # enable for debugging -#set -x +set -x set -e if [ ! -x tools/updatepofiles ]; then