todolist: removed buttonpanel and added toolbutton help

git-svn-id: trunk@56216 -
This commit is contained in:
mattias 2017-10-27 12:37:32 +00:00
parent 62ed571049
commit f5a7e41c66
16 changed files with 100 additions and 54 deletions

View File

@ -22,6 +22,10 @@ msgstr "Obnovit"
msgid "Insert Macro"
msgstr "Vložit makro"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr ""

View File

@ -23,6 +23,10 @@ msgstr "Aktualisieren"
msgid "Insert Macro"
msgstr "Makro einfügen"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr "Einstellungen"

View File

@ -21,6 +21,10 @@ msgstr "Actualizar"
msgid "Insert Macro"
msgstr "Insertar Macro"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr ""

View File

@ -13,6 +13,10 @@ msgstr "Päivitä"
msgid "Insert Macro"
msgstr "Lisää Makro"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr ""

View File

@ -23,6 +23,10 @@ msgstr "Rafraîchir"
msgid "Insert Macro"
msgstr "Insérer une macro"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr "Options"

View File

@ -23,6 +23,10 @@ msgstr "Frissítés"
msgid "Insert Macro"
msgstr "Makró beszúrása"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr "Beállítások"

View File

@ -24,6 +24,10 @@ msgstr "Aggiorna"
msgid "Insert Macro"
msgstr "Inserisci Macro"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr ""

View File

@ -24,6 +24,10 @@ msgstr "Atnaujinti"
msgid "Insert Macro"
msgstr "Įterpti makrokomandą"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr "Nuostatos"

View File

@ -24,6 +24,10 @@ msgstr "Odśwież"
msgid "Insert Macro"
msgstr "Wstaw Makro"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr ""

View File

@ -13,6 +13,10 @@ msgstr ""
msgid "Insert Macro"
msgstr ""
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr ""

View File

@ -23,6 +23,10 @@ msgstr "Atualizar"
msgid "Insert Macro"
msgstr "Inserir Macro"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr ""

View File

@ -23,6 +23,10 @@ msgstr "Обновить"
msgid "Insert Macro"
msgstr "Вставить макрос"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr "Параметры"

View File

@ -25,6 +25,10 @@ msgstr "Оновити"
msgid "Insert Macro"
msgstr "Вставити макрос"
#: todoliststrconsts.lishelp
msgid "Help"
msgstr ""
#: todoliststrconsts.lisoptions
msgid "Options"
msgstr "Параметри"

View File

@ -14,10 +14,10 @@ object IDETodoWindow: TIDETodoWindow
OnShow = FormShow
Position = poScreenCenter
SessionProperties = 'chkListed.Checked;chkUsed.Checked;chkSourceEditor.Checked;chkPackages.Checked'
LCLVersion = '1.7'
LCLVersion = '1.9.0.0'
object lvTodo: TListView
Left = 6
Height = 207
Height = 240
Top = 54
Width = 825
Align = alClient
@ -79,40 +79,39 @@ object IDETodoWindow: TIDETodoWindow
AutoSize = True
end
object tbGoto: TToolButton
Left = 52
Left = 53
Top = 2
Action = acGoto
AutoSize = True
end
object tbExport: TToolButton
Left = 99
Left = 100
Top = 2
Action = acExport
AutoSize = True
end
object N1: TToolButton
Left = 146
Left = 147
Height = 46
Top = 2
Width = 5
Caption = 'N1'
Style = tbsDivider
end
object grbOptions: TGroupBox
Left = 151
Height = 40
Left = 152
Height = 39
Top = 2
Width = 244
Width = 252
AutoSize = True
Caption = 'Options'
ClientHeight = 21
ClientWidth = 240
ClientHeight = 24
ClientWidth = 248
TabOrder = 0
object chkListed: TCheckBox
Left = 0
Height = 21
Height = 24
Top = 0
Width = 56
Width = 59
Align = alLeft
Caption = '&Listed'
Checked = True
@ -121,10 +120,10 @@ object IDETodoWindow: TIDETodoWindow
TabOrder = 0
end
object chkUsed: TCheckBox
Left = 56
Height = 21
Left = 59
Height = 24
Top = 0
Width = 52
Width = 53
Align = alLeft
Caption = '&Used'
Checked = True
@ -133,10 +132,10 @@ object IDETodoWindow: TIDETodoWindow
TabOrder = 1
end
object chkSourceEditor: TCheckBox
Left = 108
Height = 21
Left = 112
Height = 24
Top = 0
Width = 56
Width = 60
Align = alLeft
Caption = 'Editor'
Checked = True
@ -145,8 +144,8 @@ object IDETodoWindow: TIDETodoWindow
TabOrder = 2
end
object chkPackages: TCheckBox
Left = 164
Height = 21
Left = 172
Height = 24
Top = 0
Width = 76
Align = alLeft
@ -155,28 +154,15 @@ object IDETodoWindow: TIDETodoWindow
TabOrder = 3
end
end
end
object ButtonPanel: TButtonPanel
Left = 6
Height = 27
Top = 267
Width = 825
OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True
HelpButton.Name = 'HelpButton'
HelpButton.DefaultCaption = True
HelpButton.OnClick = HelpButtonClick
CloseButton.Name = 'CloseButton'
CloseButton.DefaultCaption = True
CancelButton.Name = 'CancelButton'
CancelButton.DefaultCaption = True
TabOrder = 2
ShowButtons = [pbClose, pbHelp]
ShowBevel = False
object tbHelp: TToolButton
Left = 404
Top = 2
Action = acHelp
end
end
object ActionList: TActionList
Left = 368
Top = 11
left = 648
top = 10
object acGoto: TAction
Caption = 'Goto'
OnExecute = acGotoExecute
@ -189,14 +175,18 @@ object IDETodoWindow: TIDETodoWindow
Caption = 'Export'
OnExecute = acExportExecute
end
object acHelp: TAction
Caption = 'acHelp'
OnExecute = acHelpExecute
end
end
object SaveDialog: TSaveDialog
OnShow = SaveDialogShow
DefaultExt = '.csv'
Filter = 'csv|*.csv'
Options = [ofCreatePrompt, ofEnableSizing, ofViewDetail]
Left = 448
Top = 11
left = 448
top = 11
end
object XMLPropStorage: TXMLPropStorage
StoredValues = <>
@ -204,7 +194,7 @@ object IDETodoWindow: TIDETodoWindow
Active = False
OnRestoringProperties = XMLPropStorageRestoringProperties
OnRestoreProperties = XMLPropStorageRestoreProperties
Left = 544
Top = 11
left = 544
top = 11
end
end

View File

@ -63,7 +63,7 @@ uses
Classes, SysUtils, Math, StrUtils, Laz_AVL_Tree,
// LCL
LCLProc, LCLType, LclIntf, Forms, Controls, StdCtrls, Dialogs, ComCtrls,
ActnList, ButtonPanel, XMLPropStorage,
ActnList, XMLPropStorage,
// LazUtils
LazUTF8Classes, LazFileUtils, LazFileCache,
// Codetools
@ -140,8 +140,8 @@ type
acGoto: TAction;
acRefresh: TAction;
acExport: TAction;
acHelp: TAction;
ActionList: TActionList;
ButtonPanel: TButtonPanel;
chkListed: TCheckBox;
chkUsed: TCheckBox;
chkPackages: TCheckBox;
@ -154,9 +154,11 @@ type
tbRefresh: TToolButton;
tbExport: TToolButton;
N1: TToolButton;
tbHelp: TToolButton;
XMLPropStorage: TXMLPropStorage;
procedure acExportExecute(Sender: TObject);
procedure acGotoExecute(Sender: TObject);
procedure acHelpExecute(Sender: TObject);
procedure acRefreshExecute(Sender: TObject);
procedure chkListedChange(Sender: TObject);
procedure chkPackagesChange(Sender: TObject);
@ -166,7 +168,6 @@ type
procedure FormCreate(Sender: TObject);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift:TShiftState);
procedure FormShow(Sender: TObject);
procedure HelpButtonClick(Sender: TObject);
procedure lvTodoClick(Sender: TObject);
procedure lvTodoColumnClick(Sender : TObject; Column : TListColumn);
procedure lvTodoCompare(Sender : TObject; Item1, Item2 : TListItem;
@ -243,6 +244,7 @@ begin
acGoto.ImageIndex := IDEImages.LoadImage('menu_goto_line');
acRefresh.ImageIndex := IDEImages.LoadImage('laz_refresh');
acExport.ImageIndex := IDEImages.LoadImage('menu_saveas');
acHelp.ImageIndex := IDEImages.LoadImage('menu_help');
SaveDialog.Filter:= dlgFilterCsv+'|*.csv';
end;
@ -342,12 +344,6 @@ begin
UpdateTodos;
end;
procedure TIDETodoWindow.HelpButtonClick(Sender: TObject);
begin
// usual API from IdeHelpIntf don't work
OpenURL('http://wiki.freepascal.org/IDE_Window:_ToDo_List');
end;
procedure TIDETodoWindow.lvTodoClick(Sender: TObject);
begin
acGoto.Execute;
@ -642,6 +638,7 @@ begin
tbRefresh.Caption := dlgUnitDepRefresh;
tbGoto.Caption := lisToDoGoto;
tbExport.Caption := lisToDoExport;
tbHelp.Caption := lisHelp;
grbOptions.Caption := lisOptions;
chkListed.Caption := lisToDoListed;
@ -692,6 +689,12 @@ begin
end;
end;
procedure TIDETodoWindow.acHelpExecute(Sender: TObject);
begin
// usual API from IdeHelpIntf don't work
OpenURL('http://wiki.freepascal.org/IDE_Window:_ToDo_List');
end;
procedure TIDETodoWindow.acExportExecute(Sender: TObject);
var
CommaList: TStringList;

View File

@ -41,6 +41,7 @@ resourcestring
lisToDoGoto = 'Goto';
lisToDoExport = 'Export';
lisOptions = 'Options';
lisHelp = 'Help';
lisToDoListed = 'Listed';
lisToDoListedHint = 'Add units listed in project inspector/package editor';
lisToDoUsed = 'Used';