Merged revision(s) 55966 #60baefff0d, 55969-55970 #a21c5e4fed-#a21c5e4fed from trunk:
IDE: HiRes icons for System component palette (by Roland Hahn) ........ IDE: High-DPI icons. Issue #32493 Patch by FTurtle ........ IDE: In ToolBarConfig ListView select correct item after adding a command. Refactoring, improve identifier names. ........ git-svn-id: branches/fixes_1_8@55980 -
30
.gitattributes
vendored
@ -659,6 +659,7 @@ components/chmhelp/lhelp/lnethttpdataprovider.pas svneol=native#text/plain
|
||||
components/chmhelp/packages/help/Makefile svneol=native#text/plain
|
||||
components/chmhelp/packages/help/Makefile.compiled svneol=native#text/plain
|
||||
components/chmhelp/packages/help/Makefile.fpc svneol=native#text/plain
|
||||
components/chmhelp/packages/help/design/copyright.txt svneol=native#text/plain
|
||||
components/chmhelp/packages/help/design/lazhelpchm.bat svneol=native#text/plain
|
||||
components/chmhelp/packages/help/design/lazhelpchm.sh svneol=native#text/plain
|
||||
components/chmhelp/packages/help/design/lazhelpchm.txt svneol=native#text/plain
|
||||
@ -6563,7 +6564,14 @@ images/actions/laz_edit.png -text svneol=unset#image/png
|
||||
images/actions/laz_export.png -text svneol=unset#image/png
|
||||
images/actions/laz_highlighter.png -text svneol=unset#image/png
|
||||
images/actions/laz_open.png -text svneol=unset#image/png
|
||||
images/actions/laz_openunit.png -text
|
||||
images/actions/laz_open_150.png -text
|
||||
images/actions/laz_open_200.png -text
|
||||
images/actions/laz_open_recent.png -text
|
||||
images/actions/laz_open_recent_150.png -text
|
||||
images/actions/laz_open_recent_200.png -text
|
||||
images/actions/laz_open_unit.png -text
|
||||
images/actions/laz_open_unit_150.png -text
|
||||
images/actions/laz_open_unit_200.png -text
|
||||
images/actions/laz_refresh.png -text svneol=unset#image/png
|
||||
images/actions/laz_save.png -text svneol=unset#image/png
|
||||
images/actions/laz_save_150.png -text
|
||||
@ -6629,6 +6637,8 @@ images/components/tarrow.png -text svneol=unset#image/png
|
||||
images/components/tarrow_150.png -text
|
||||
images/components/tarrow_200.png -text
|
||||
images/components/tasyncprocess.png -text
|
||||
images/components/tasyncprocess_150.png -text
|
||||
images/components/tasyncprocess_200.png -text
|
||||
images/components/tbevel.png -text svneol=unset#image/png
|
||||
images/components/tbevel_150.png -text
|
||||
images/components/tbevel_200.png -text
|
||||
@ -6744,6 +6754,8 @@ images/components/teditbutton.png -text svneol=unset#image/png
|
||||
images/components/teditbutton_150.png -text
|
||||
images/components/teditbutton_200.png -text
|
||||
images/components/teventlog.png -text svneol=unset#image/png
|
||||
images/components/teventlog_150.png -text
|
||||
images/components/teventlog_200.png -text
|
||||
images/components/tfilelistbox.png -text svneol=unset#image/png
|
||||
images/components/tfilenameedit.png -text svneol=unset#image/png
|
||||
images/components/tfiltercombobox.png -text
|
||||
@ -6769,6 +6781,8 @@ images/components/theadercontrol.png -text svneol=unset#image/png
|
||||
images/components/theadercontrol_150.png -text
|
||||
images/components/theadercontrol_200.png -text
|
||||
images/components/thtmlbrowserhelpviewer.png -text svneol=unset#image/png
|
||||
images/components/thtmlbrowserhelpviewer_150.png -text
|
||||
images/components/thtmlbrowserhelpviewer_200.png -text
|
||||
images/components/thtmlhelpdatabase.png -text svneol=unset#image/png
|
||||
images/components/thtmlhelpdatabase_150.png -text
|
||||
images/components/thtmlhelpdatabase_200.png -text
|
||||
@ -6795,6 +6809,8 @@ images/components/tlabelededit.png -text svneol=unset#image/png
|
||||
images/components/tlabelededit_150.png -text
|
||||
images/components/tlabelededit_200.png -text
|
||||
images/components/tlazcomponentqueue.png -text svneol=unset#image/png
|
||||
images/components/tlazcomponentqueue_150.png -text
|
||||
images/components/tlazcomponentqueue_200.png -text
|
||||
images/components/tlistbox.png -text svneol=unset#image/png
|
||||
images/components/tlistbox_150.png -text
|
||||
images/components/tlistbox_200.png -text
|
||||
@ -6842,7 +6858,11 @@ images/components/tpopupnotifier.png -text svneol=unset#image/png
|
||||
images/components/tpopupnotifier_150.png -text
|
||||
images/components/tpopupnotifier_200.png -text
|
||||
images/components/tprocess.png -text svneol=unset#image/png
|
||||
images/components/tprocess_150.png -text
|
||||
images/components/tprocess_200.png -text
|
||||
images/components/tprocessutf8.png -text
|
||||
images/components/tprocessutf8_150.png -text
|
||||
images/components/tprocessutf8_200.png -text
|
||||
images/components/tprogressbar.png -text svneol=unset#image/png
|
||||
images/components/tprogressbar_150.png -text
|
||||
images/components/tprogressbar_200.png -text
|
||||
@ -6870,13 +6890,19 @@ images/components/tscrollbox_200.png -text
|
||||
images/components/tselectdirectorydialog.png -text svneol=unset#image/png
|
||||
images/components/tselectdirectorydialog_150.png -text
|
||||
images/components/tservicemanager.png -text svneol=unset#image/png
|
||||
images/components/tservicemanager_150.png -text
|
||||
images/components/tservicemanager_200.png -text
|
||||
images/components/tshape.png -text svneol=unset#image/png
|
||||
images/components/tshape_150.png -text
|
||||
images/components/tshape_200.png -text
|
||||
images/components/tshelllistview.png -text
|
||||
images/components/tshelltreeview.png -text
|
||||
images/components/tsimpleipcclient.png -text svneol=unset#image/png
|
||||
images/components/tsimpleipcclient_150.png -text
|
||||
images/components/tsimpleipcclient_200.png -text
|
||||
images/components/tsimpleipcserver.png -text svneol=unset#image/png
|
||||
images/components/tsimpleipcserver_150.png -text
|
||||
images/components/tsimpleipcserver_200.png -text
|
||||
images/components/tspeedbutton.png -text svneol=unset#image/png
|
||||
images/components/tspeedbutton_150.png -text
|
||||
images/components/tspeedbutton_200.png -text
|
||||
@ -7322,6 +7348,8 @@ images/menu/menu_search_next_bookmark.png -text
|
||||
images/menu/menu_search_next_bookmark_150.png -text
|
||||
images/menu/menu_search_next_bookmark_200.png -text
|
||||
images/menu/menu_search_openfile_atcursor.png -text svneol=unset#image/png
|
||||
images/menu/menu_search_openfile_atcursor_150.png -text
|
||||
images/menu/menu_search_openfile_atcursor_200.png -text
|
||||
images/menu/menu_search_previous_bookmark.png -text
|
||||
images/menu/menu_search_previous_bookmark_150.png -text
|
||||
images/menu/menu_search_previous_bookmark_200.png -text
|
||||
|
10
components/chmhelp/packages/help/design/copyright.txt
Normal file
@ -0,0 +1,10 @@
|
||||
The images
|
||||
|
||||
tchmhelpdatabase.png
|
||||
tchmhelpdatabase_150.png
|
||||
tchmhelpdatabase_200.png
|
||||
thelpconnector.png
|
||||
thelpconnector_150.png
|
||||
thelpconnector_200.png
|
||||
|
||||
are drawn by Roland Hahn. Freeware, no restrictions in usage.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 2.3 KiB |
@ -998,8 +998,8 @@ begin
|
||||
ParentMI:=itmFileOpenSave;
|
||||
CreateMenuItem(ParentMI, itmFileOpen, 'itmFileOpen', lisMenuOpen, 'laz_open');
|
||||
CreateMenuItem(ParentMI,itmFileRevert,'itmFileRevert',lisMenuRevert, 'menu_file_revert');
|
||||
CreateMenuItem(ParentMI, itmFileOpenUnit, 'itmFileOpenUnit', lisMenuOpenUnit, 'laz_openunit');
|
||||
CreateMenuSubSection(ParentMI,itmFileRecentOpen,'itmFileRecentOpen',lisMenuOpenRecent);
|
||||
CreateMenuItem(ParentMI, itmFileOpenUnit, 'itmFileOpenUnit', lisMenuOpenUnit, 'laz_open_unit');
|
||||
CreateMenuSubSection(ParentMI,itmFileRecentOpen,'itmFileRecentOpen',lisMenuOpenRecent, 'laz_open_recent');
|
||||
CreateMenuItem(ParentMI,itmFileSave,'itmFileSave',lisMenuSave,'laz_save');
|
||||
CreateMenuItem(ParentMI,itmFileSaveAs,'itmFileSaveAs',lisMenuSaveAs,'menu_saveas');
|
||||
CreateMenuItem(ParentMI,itmFileSaveAll,'itmFileSaveAll',lisSaveAll,'menu_save_all');
|
||||
|
@ -37,13 +37,12 @@ uses
|
||||
LazarusIDEStrConsts;
|
||||
|
||||
const
|
||||
IDEToolBarConfigVersion = 1;
|
||||
// 1 added file version in config
|
||||
IDEToolBarConfigVersion = 1; // File version in configuration.
|
||||
|
||||
type
|
||||
{ TLvItem }
|
||||
TLvItem = class (TObject)
|
||||
Item: TIDEButtonCommand;
|
||||
Command: TIDEButtonCommand;
|
||||
LvIndex: Integer;
|
||||
end;
|
||||
|
||||
@ -96,17 +95,18 @@ type
|
||||
MainList: TStringList;
|
||||
procedure AddCommand;
|
||||
procedure AddTailItem;
|
||||
function GetMainListIndex(Item: TListItem): Integer;
|
||||
procedure InsertMainListItem(Item, NextItem: TListItem);
|
||||
function GetMainListIndex(aLvIndex: Integer): Integer;
|
||||
procedure InsertMainListItem(Item: TListItem);
|
||||
function NewLvItem(aCaption: string): TListItem;
|
||||
procedure RemoveCommand;
|
||||
procedure RemoveMainListItem(Item: TListItem);
|
||||
procedure ExchangeMainListItem(Item1, Item2: TListItem);
|
||||
procedure SetupCaptions;
|
||||
procedure LoadCategories;
|
||||
procedure AddMenuItem(ParentNode: TTreeNode; Item: TIDEButtonCommand);
|
||||
function RootNodeCaption(Item: TIDEButtonCommand): string;
|
||||
procedure AddListItem(Item: TIDEButtonCommand);
|
||||
procedure AddToolBarItem(Item: TIDEButtonCommand);
|
||||
procedure AddMenuItem(ParentNode: TTreeNode; CmdItem: TIDEButtonCommand);
|
||||
function RootNodeCaption(CmdItem: TIDEButtonCommand): string;
|
||||
procedure AddListItem(CmdItem: TIDEButtonCommand);
|
||||
procedure AddToolBarItem(CmdItem: TIDEButtonCommand);
|
||||
procedure AddDivider;
|
||||
procedure FillToolBar;
|
||||
public
|
||||
@ -261,27 +261,35 @@ begin
|
||||
UpdateButtonsState;
|
||||
end;
|
||||
|
||||
function TToolBarConfig.GetMainListIndex(Item: TListItem): Integer;
|
||||
function TToolBarConfig.GetMainListIndex(aLvIndex: Integer): Integer;
|
||||
var
|
||||
I: Integer;
|
||||
begin
|
||||
for I:= 0 to MainList.Count -1 do
|
||||
if TLvItem(MainList.Objects[I]).LvIndex = Item.Index then
|
||||
if TLvItem(MainList.Objects[I]).LvIndex = aLvIndex then
|
||||
Exit(I);
|
||||
Result := -1;
|
||||
end;
|
||||
|
||||
procedure TToolBarConfig.InsertMainListItem(Item, NextItem: TListItem);
|
||||
procedure TToolBarConfig.InsertMainListItem(Item: TListItem);
|
||||
var
|
||||
NextInd, I: Integer;
|
||||
aMainListItem: TLvItem;
|
||||
begin
|
||||
// New selection. Clear previous selection to avoid double sel in Qt.
|
||||
lvToolbar.ItemIndex := -1;
|
||||
lvToolbar.Selected := nil;
|
||||
if Item.Index < lvToolbar.Items.Count then
|
||||
lvToolbar.ItemIndex := Item.Index+1
|
||||
else
|
||||
lvToolbar.ItemIndex := Item.Index;
|
||||
// New MainList item.
|
||||
aMainListItem := TLvItem.Create;
|
||||
aMainListItem.Item := TIDEButtonCommand(Item.Data);
|
||||
aMainListItem.Command := TIDEButtonCommand(Item.Data);
|
||||
aMainListItem.LvIndex := Item.Index;
|
||||
Assert(Assigned(NextItem), 'TToolBarConfig.InsertMainListItem: NextItem = Nil.');
|
||||
NextInd := GetMainListIndex(NextItem);
|
||||
NextInd := GetMainListIndex(Item.Index);
|
||||
MainList.InsertObject(NextInd, Item.Caption, aMainListItem);
|
||||
// Update indices of existing MainList items.
|
||||
for I := NextInd+1 to MainList.Count -1 do
|
||||
begin
|
||||
aMainListItem := TLvItem(MainList.Objects[I]);
|
||||
@ -291,10 +299,10 @@ end;
|
||||
|
||||
procedure TToolBarConfig.RemoveMainListItem(Item: TListItem);
|
||||
var
|
||||
I,J: Integer;
|
||||
I, J: Integer;
|
||||
aMainListItem: TLvItem;
|
||||
begin
|
||||
I := GetMainListIndex(Item);
|
||||
I := GetMainListIndex(Item.Index);
|
||||
if I > -1 then begin
|
||||
MainList.Delete(I);
|
||||
for J := I to MainList.Count -1 do begin
|
||||
@ -309,8 +317,8 @@ var
|
||||
MainIndex1,MainIndex2: Integer;
|
||||
aMainListItem: TLvItem;
|
||||
begin
|
||||
MainIndex1:= GetMainListIndex(Item1);
|
||||
MainIndex2:= GetMainListIndex(Item2);
|
||||
MainIndex1:= GetMainListIndex(Item1.Index);
|
||||
MainIndex2:= GetMainListIndex(Item2.Index);
|
||||
MainList.Exchange(MainIndex1,MainIndex2);
|
||||
aMainListItem := TLvItem(MainList.Objects[MainIndex1]);
|
||||
aMainListItem.LvIndex:= Item1.Index;
|
||||
@ -323,66 +331,56 @@ begin
|
||||
AddCommand;
|
||||
end;
|
||||
|
||||
function TToolBarConfig.NewLvItem(aCaption: string): TListItem;
|
||||
var
|
||||
I: Integer;
|
||||
begin
|
||||
I := lvToolbar.ItemIndex;
|
||||
if I = -1 then
|
||||
I := lvToolbar.Items.Count-1; // Add before the last empty item.
|
||||
Result := lvToolbar.Items.Insert(I);
|
||||
Result.Caption := aCaption;
|
||||
end;
|
||||
|
||||
procedure TToolBarConfig.AddCommand;
|
||||
var
|
||||
n, nNext: TTreeNode;
|
||||
ACaption: string;
|
||||
Node: TTreeNode;
|
||||
CmdCaption: string;
|
||||
lvItem: TListItem;
|
||||
anIndex: Integer;
|
||||
begin
|
||||
n := TV.Selected;
|
||||
if (n = Nil) or (n.Data = Nil) then
|
||||
Node := TV.Selected;
|
||||
if (Node = Nil) or (Node.Data = Nil) then
|
||||
Exit;
|
||||
ACaption := TIDEButtonCommand(n.Data).Caption;
|
||||
DeleteAmpersands(ACaption);
|
||||
anIndex := lvToolbar.ItemIndex;
|
||||
if anIndex = -1 then
|
||||
begin
|
||||
anIndex := lvToolbar.Items.Count-1; // Add before the last empty item.
|
||||
Assert(anIndex >= 0, 'TToolBarConfig.AddCommand: Index < 0.');
|
||||
end;
|
||||
lvItem := lvToolbar.Items.Insert(anIndex);
|
||||
lvItem.Caption := ACaption;
|
||||
lvItem.Data := n.Data;
|
||||
CmdCaption := TIDEButtonCommand(Node.Data).Caption;
|
||||
DeleteAmpersands(CmdCaption);
|
||||
lvItem := NewLvItem(CmdCaption);
|
||||
lvItem.Data := Node.Data;
|
||||
{$IF not DEFINED(LCLQt) and not DEFINED(LCLQt5)}
|
||||
if n.ImageIndex > -1 then
|
||||
lvItem.ImageIndex := n.ImageIndex
|
||||
if Node.ImageIndex > -1 then
|
||||
lvItem.ImageIndex := Node.ImageIndex
|
||||
else
|
||||
lvItem.ImageIndex := defImageIndex;
|
||||
{$ENDIF}
|
||||
//lvItem.SubItems.Add(IntToStr(CurrProfile));
|
||||
// clear previous selection to avoid double sel in Qt
|
||||
lvToolbar.Selected := nil;
|
||||
lvToolbar.ItemIndex := lvItem.Index;
|
||||
InsertMainListItem(lvItem, lvToolbar.Items[anIndex]);
|
||||
// Add the newly created item to ListView.
|
||||
InsertMainListItem(lvItem);
|
||||
// Update selection in TreeView.
|
||||
nNext := TV.Selected.GetNext;
|
||||
Node := TV.Selected.GetNext;
|
||||
TV.Selected.Visible:= False;
|
||||
if nNext <> nil then
|
||||
TV.Selected := nNext;
|
||||
if Node <> nil then
|
||||
TV.Selected := Node;
|
||||
UpdateButtonsState;
|
||||
end;
|
||||
|
||||
procedure TToolBarConfig.btnAddDividerClick(Sender: TObject);
|
||||
var
|
||||
lvItem: TListItem;
|
||||
anIndex: Integer;
|
||||
begin
|
||||
anIndex := lvToolbar.ItemIndex;
|
||||
if anIndex = -1 then
|
||||
begin
|
||||
anIndex := lvToolbar.Items.Count-1; // Add before the last empty item.
|
||||
Assert(anIndex >= 0, 'TToolBarConfig.btnAddDividerClick: Index < 0.');
|
||||
end;
|
||||
lvItem := lvToolbar.Items.Insert(anIndex);
|
||||
//lvItem.Selected := False;
|
||||
lvItem.Caption:= cIDEToolbarDivider;
|
||||
lvItem := NewLvItem(cIDEToolbarDivider);
|
||||
{$IF not DEFINED(LCLQt) and not DEFINED(LCLQt5)}
|
||||
lvItem.ImageIndex := divImageIndex;
|
||||
{$ENDIF}
|
||||
lvToolbar.Selected := nil;
|
||||
lvToolbar.ItemIndex := lvItem.Index;
|
||||
InsertMainListItem(lvItem, lvToolbar.Items[anIndex]);
|
||||
InsertMainListItem(lvItem);
|
||||
UpdateButtonsState;
|
||||
end;
|
||||
|
||||
@ -452,7 +450,6 @@ procedure TToolBarConfig.lvToolbarSelectItem(Sender: TObject;
|
||||
Item: TListItem; Selected: Boolean);
|
||||
begin
|
||||
UpdateButtonsState;
|
||||
|
||||
if lvToolbar.ItemIndex<lvToolbar.Items.Count-1 then
|
||||
lblSelect.Caption:=Format('%d / %d', [lvToolbar.ItemIndex+1, lvToolbar.Items.Count-1])
|
||||
else
|
||||
@ -526,24 +523,23 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TToolBarConfig.AddMenuItem(ParentNode: TTreeNode;
|
||||
Item: TIDEButtonCommand);
|
||||
procedure TToolBarConfig.AddMenuItem(ParentNode: TTreeNode; CmdItem: TIDEButtonCommand);
|
||||
var
|
||||
n: TTreeNode;
|
||||
begin
|
||||
if Item.Caption <> '-' then begin // workaround for HTML Editor dividers
|
||||
n := TV.Items.AddChild(ParentNode, Format('%s', [Item.GetCaptionWithShortCut]));
|
||||
n.ImageIndex := Item.ImageIndex;
|
||||
n.SelectedIndex := Item.ImageIndex;
|
||||
n.Data := Item;
|
||||
if CmdItem.Caption <> '-' then begin // workaround for HTML Editor dividers
|
||||
n := TV.Items.AddChild(ParentNode, Format('%s', [CmdItem.GetCaptionWithShortCut]));
|
||||
n.ImageIndex := CmdItem.ImageIndex;
|
||||
n.SelectedIndex := CmdItem.ImageIndex;
|
||||
n.Data := CmdItem;
|
||||
end;
|
||||
end;
|
||||
|
||||
function TToolBarConfig.RootNodeCaption(Item: TIDEButtonCommand): string;
|
||||
function TToolBarConfig.RootNodeCaption(CmdItem: TIDEButtonCommand): string;
|
||||
var
|
||||
aCaption: string;
|
||||
begin
|
||||
aCaption:= Item.Caption;
|
||||
aCaption:= CmdItem.Caption;
|
||||
case aCaption of
|
||||
'IDEMainMenu': Result := lisCoolbarIDEMainMenu; // mnuMain
|
||||
'SourceTab': Result := lisCoolbarSourceTab; // SourceTabMenuRootName
|
||||
@ -558,41 +554,40 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TToolBarConfig.AddListItem(Item: TIDEButtonCommand);
|
||||
procedure TToolBarConfig.AddListItem(CmdItem: TIDEButtonCommand);
|
||||
var
|
||||
aListItem: TLvItem;
|
||||
begin
|
||||
aListItem := TLvItem.Create;
|
||||
if assigned(Item) then begin
|
||||
aListItem.Item := Item;
|
||||
MainList.AddObject(Item.Caption,aListItem);
|
||||
if assigned(CmdItem) then begin
|
||||
aListItem.Command := CmdItem;
|
||||
MainList.AddObject(CmdItem.Caption, aListItem);
|
||||
end
|
||||
else begin
|
||||
aListItem.Item := nil;
|
||||
MainList.AddObject(cIDEToolbarDivider,aListItem);
|
||||
aListItem.Command := nil;
|
||||
MainList.AddObject(cIDEToolbarDivider, aListItem);
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TToolBarConfig.AddToolBarItem(Item: TIDEButtonCommand);
|
||||
procedure TToolBarConfig.AddToolBarItem(CmdItem: TIDEButtonCommand);
|
||||
Var
|
||||
n: TTreeNode;
|
||||
Node: TTreeNode;
|
||||
lvItem: TListItem;
|
||||
begin
|
||||
if Assigned(Item) then begin
|
||||
lvItem := lvToolbar.Items.Add;
|
||||
lvItem.Caption:= Item.GetCaptionWithShortCut;
|
||||
lvItem.Data:= Item;
|
||||
{$IF not DEFINED(LCLQt) and not DEFINED(LCLQt5)}
|
||||
if Item.ImageIndex > -1 then
|
||||
lvItem.ImageIndex:= Item.ImageIndex
|
||||
else
|
||||
lvItem.ImageIndex:= defImageIndex;
|
||||
{$ENDIF}
|
||||
// lvItem.SubItems.Add(IntToStr(PMask));
|
||||
n:= TV.Items.FindNodeWithData(Item);
|
||||
if n<>nil then
|
||||
n.Visible:= False;
|
||||
end;
|
||||
if CmdItem=Nil then Exit;
|
||||
lvItem := lvToolbar.Items.Add;
|
||||
lvItem.Caption := CmdItem.GetCaptionWithShortCut;
|
||||
lvItem.Data := CmdItem;
|
||||
{$IF not DEFINED(LCLQt) and not DEFINED(LCLQt5)}
|
||||
if CmdItem.ImageIndex > -1 then
|
||||
lvItem.ImageIndex := CmdItem.ImageIndex
|
||||
else
|
||||
lvItem.ImageIndex := defImageIndex;
|
||||
{$ENDIF}
|
||||
// lvItem.SubItems.Add(IntToStr(PMask));
|
||||
Node := TV.Items.FindNodeWithData(CmdItem);
|
||||
if Node<>nil then
|
||||
Node.Visible := False;
|
||||
end;
|
||||
|
||||
procedure TToolBarConfig.AddDivider;
|
||||
@ -630,20 +625,20 @@ var
|
||||
I: Integer;
|
||||
aListItem: TLvItem;
|
||||
aCaption: string;
|
||||
mi: TIDEButtonCommand;
|
||||
Cmd: TIDEButtonCommand;
|
||||
begin
|
||||
for I:= 0 to MainList.Count -1 do
|
||||
for I := 0 to MainList.Count -1 do
|
||||
begin
|
||||
aListItem := TLvItem(MainList.Objects[I]);
|
||||
mi := aListItem.Item;
|
||||
Cmd := aListItem.Command;
|
||||
aCaption := MainList.Strings[I];
|
||||
if aCaption = cIDEToolbarDivider then
|
||||
if i<(MainList.Count-1) then
|
||||
if I < MainList.Count-1 then
|
||||
AddDivider
|
||||
else
|
||||
AddTailItem // add tail item instead extra divider at the end of list
|
||||
else
|
||||
AddToolBarItem(mi);
|
||||
AddToolBarItem(Cmd);
|
||||
aListItem.LvIndex:= lvToolbar.Items.Count - 1;
|
||||
end;
|
||||
end;
|
||||
@ -652,20 +647,20 @@ procedure TToolBarConfig.LoadSettings(SL: TStringList);
|
||||
var
|
||||
I: Integer;
|
||||
Value: string;
|
||||
MI: TIDEButtonCommand;
|
||||
Cmd: TIDEButtonCommand;
|
||||
begin
|
||||
for I := 0 to SL.Count - 1 do
|
||||
begin
|
||||
Value := SL[I];
|
||||
if Value = '' then Continue;
|
||||
if Value = cIDEToolbarDivider then
|
||||
MI := nil
|
||||
Cmd := nil
|
||||
else
|
||||
begin
|
||||
MI := IDEToolButtonCategories.FindItemByMenuPathOrName(Value);
|
||||
Cmd := IDEToolButtonCategories.FindItemByMenuPathOrName(Value);
|
||||
SL[I] := Value;
|
||||
end;
|
||||
AddListItem(MI);
|
||||
AddListItem(Cmd);
|
||||
end;
|
||||
|
||||
AddListItem(nil); // add extra divider at the end of list. This extra divider
|
||||
@ -680,13 +675,13 @@ var
|
||||
I: Integer;
|
||||
begin
|
||||
SL.Clear;
|
||||
for i := 0 to MainList.Count - 2 do // excluding tail item
|
||||
for I := 0 to MainList.Count - 2 do // excluding tail item
|
||||
begin
|
||||
lvItem := TLvItem(MainList.Objects[I]);
|
||||
if MainList[I] = cIDEToolbarDivider then
|
||||
SL.Add(cIDEToolbarDivider)
|
||||
else
|
||||
SL.Add(lvItem.Item.Name);
|
||||
SL.Add(lvItem.Command.Name);
|
||||
end;
|
||||
end;
|
||||
|
||||
|
Before Width: | Height: | Size: 634 B After Width: | Height: | Size: 522 B |
BIN
images/actions/laz_open_150.png
Normal file
After Width: | Height: | Size: 780 B |
BIN
images/actions/laz_open_200.png
Normal file
After Width: | Height: | Size: 1.0 KiB |
BIN
images/actions/laz_open_recent.png
Normal file
After Width: | Height: | Size: 607 B |
BIN
images/actions/laz_open_recent_150.png
Normal file
After Width: | Height: | Size: 937 B |
BIN
images/actions/laz_open_recent_200.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
images/actions/laz_open_unit.png
Normal file
After Width: | Height: | Size: 726 B |
BIN
images/actions/laz_open_unit_150.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
images/actions/laz_open_unit_200.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 686 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |
BIN
images/components/tasyncprocess_150.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
images/components/tasyncprocess_200.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 462 B After Width: | Height: | Size: 1.0 KiB |
BIN
images/components/teventlog_150.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
images/components/teventlog_200.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 641 B After Width: | Height: | Size: 920 B |
BIN
images/components/thtmlbrowserhelpviewer_150.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
images/components/thtmlbrowserhelpviewer_200.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 598 B After Width: | Height: | Size: 910 B |
BIN
images/components/tlazcomponentqueue_150.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
BIN
images/components/tlazcomponentqueue_200.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |
BIN
images/components/tprocess_150.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
images/components/tprocess_200.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
images/components/tprocessutf8_150.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
BIN
images/components/tprocessutf8_200.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
BIN
images/components/tservicemanager_150.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
BIN
images/components/tservicemanager_200.png
Normal file
After Width: | Height: | Size: 4.0 KiB |
Before Width: | Height: | Size: 441 B After Width: | Height: | Size: 637 B |
BIN
images/components/tsimpleipcclient_150.png
Normal file
After Width: | Height: | Size: 927 B |
BIN
images/components/tsimpleipcclient_200.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 477 B After Width: | Height: | Size: 702 B |
BIN
images/components/tsimpleipcserver_150.png
Normal file
After Width: | Height: | Size: 961 B |
BIN
images/components/tsimpleipcserver_200.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 415 B After Width: | Height: | Size: 853 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.8 KiB |
@ -9,6 +9,8 @@ components/tarrow.png
|
||||
components/tarrow_150.png
|
||||
components/tarrow_200.png
|
||||
components/tasyncprocess.png
|
||||
components/tasyncprocess_150.png
|
||||
components/tasyncprocess_200.png
|
||||
components/tbevel.png
|
||||
components/tbevel_150.png
|
||||
components/tbevel_200.png
|
||||
@ -124,6 +126,8 @@ components/teditbutton.png
|
||||
components/teditbutton_150.png
|
||||
components/teditbutton_200.png
|
||||
components/teventlog.png
|
||||
components/teventlog_150.png
|
||||
components/teventlog_200.png
|
||||
components/tfilelistbox.png
|
||||
components/tfilenameedit.png
|
||||
components/tfiltercombobox.png
|
||||
@ -149,6 +153,8 @@ components/theadercontrol.png
|
||||
components/theadercontrol_150.png
|
||||
components/theadercontrol_200.png
|
||||
components/thtmlbrowserhelpviewer.png
|
||||
components/thtmlbrowserhelpviewer_150.png
|
||||
components/thtmlbrowserhelpviewer_200.png
|
||||
components/thtmlhelpdatabase.png
|
||||
components/thtmlhelpdatabase_150.png
|
||||
components/thtmlhelpdatabase_200.png
|
||||
@ -175,6 +181,8 @@ components/tlabelededit.png
|
||||
components/tlabelededit_150.png
|
||||
components/tlabelededit_200.png
|
||||
components/tlazcomponentqueue.png
|
||||
components/tlazcomponentqueue_150.png
|
||||
components/tlazcomponentqueue_200.png
|
||||
components/tlistbox.png
|
||||
components/tlistbox_150.png
|
||||
components/tlistbox_200.png
|
||||
@ -222,7 +230,11 @@ components/tpopupnotifier.png
|
||||
components/tpopupnotifier_150.png
|
||||
components/tpopupnotifier_200.png
|
||||
components/tprocess.png
|
||||
components/tprocess_150.png
|
||||
components/tprocess_200.png
|
||||
components/tprocessutf8.png
|
||||
components/tprocessutf8_150.png
|
||||
components/tprocessutf8_200.png
|
||||
components/tprogressbar.png
|
||||
components/tprogressbar_150.png
|
||||
components/tprogressbar_200.png
|
||||
@ -250,13 +262,19 @@ components/tscrollbox_200.png
|
||||
components/tselectdirectorydialog.png
|
||||
components/tselectdirectorydialog_150.png
|
||||
components/tservicemanager.png
|
||||
components/tservicemanager_150.png
|
||||
components/tservicemanager_200.png
|
||||
components/tshape.png
|
||||
components/tshape_150.png
|
||||
components/tshape_200.png
|
||||
components/tshelllistview.png
|
||||
components/tshelltreeview.png
|
||||
components/tsimpleipcclient.png
|
||||
components/tsimpleipcclient_150.png
|
||||
components/tsimpleipcclient_200.png
|
||||
components/tsimpleipcserver.png
|
||||
components/tsimpleipcserver_150.png
|
||||
components/tsimpleipcserver_200.png
|
||||
components/tspeedbutton.png
|
||||
components/tspeedbutton_150.png
|
||||
components/tspeedbutton_200.png
|
||||
|
@ -40,6 +40,15 @@ arrow__darkred_up_200.png
|
||||
autocomplete.png
|
||||
autocomplete_150.png
|
||||
autocomplete_200.png
|
||||
laz_open.png
|
||||
laz_open_150.png
|
||||
laz_open_200.png
|
||||
laz_open_recent.png
|
||||
laz_open_recent_150.png
|
||||
laz_open_recent_200.png
|
||||
laz_open_unit.png
|
||||
laz_open_unit_150.png
|
||||
laz_open_unit_200.png
|
||||
laz_save.png
|
||||
laz_save_150.png
|
||||
laz_save_200.png
|
||||
@ -256,6 +265,9 @@ menu_search_jumpforward_200.png
|
||||
menu_search_next_bookmark.png
|
||||
menu_search_next_bookmark_150.png
|
||||
menu_search_next_bookmark_200.png
|
||||
menu_search_openfile_atcursor.png
|
||||
menu_search_openfile_atcursor_150.png
|
||||
menu_search_openfile_atcursor_200.png
|
||||
menu_search_previous_bookmark.png
|
||||
menu_search_previous_bookmark_150.png
|
||||
menu_search_previous_bookmark_200.png
|
||||
@ -389,6 +401,7 @@ components folder:
|
||||
tactionlist.png, tactionlist_150.png, tactionlist_200.png
|
||||
tapplicationproperties.png, tapplicationproperties_150.png, tapplicationproperties_200.png
|
||||
tarrow.png, tarrow_150.png, tarrow_200.png
|
||||
tasyncprocess.png, tasyncprocess_150.png, tasyncprocess_200.png
|
||||
tbevel.png, tbevel_150.png, tbevel_200.png
|
||||
tbitbtn.png, tbitbtn_150.png, tbitbtn_200.png
|
||||
tbutton.png, tbutton_150.png, tbutton_200.png
|
||||
@ -407,11 +420,14 @@ tflowpanel.png, tflowpanel_150.png, tflowpanel_200.png
|
||||
tframe.png, tframe_150.png, tframe_200.png
|
||||
tgroupbox.png, tgroupbox_150.png, tgroupbox_200.png
|
||||
theadercontrol.png, theadercontrol_150.png, theadercontrol_200.png
|
||||
thtmlbrowserhelpviewer.png, thtmlbrowserhelpviewer_150.png, thtmlbrowserhelpviewer_200.png
|
||||
thtmlhelpdatabase.png, thtmlhelpdatabase_150.png, thtmlhelpdatabase_200.png
|
||||
tidletimer.png, tidletimer_150.png, tidletimer_200.pgn
|
||||
timage.png, timage_150.png timage_200.png
|
||||
timagelist.png timagelist_150.pgn timagelist_200.pgn
|
||||
tlabel.png, tlabel_150.png, tlabel_200.png
|
||||
tlabelededit.png, tlabelededit_150.png, tlabelededit_200.png
|
||||
tlazcomponentqueue.png, tlazcomponentqueue_150.png, tlazcomponentqueue_200.png
|
||||
tlistbox.png, tlistbox_150.png, tlistbox_200.png
|
||||
tlistview.png, tlistview_150.png, tlistview_200.png
|
||||
tmainmenu.png, tmainmenu_150.png, tmainmenu_200.png
|
||||
@ -425,12 +441,17 @@ tpairsplitter.png, tpairsplitter_150.png, tpairsplitter_200.png
|
||||
tpanel.png, tpanel_150.png, tpanel_200.png
|
||||
tpopupmenu.png, tpopupmenu_150.png tpopupmenu_200.png
|
||||
tpopupnotifier.png, tpopupnptifier_150.png, tpopupnotifier_200.png
|
||||
tprocess.png, tprocess_150.png, tprocess_200.png
|
||||
tprocessuf8.png, tprocessutf8_150.png, tprocessutf8_200.png
|
||||
tprogressbar.png, tprogressbar_150.png, tprogressbar_200.png
|
||||
tradiobutton.png, tradiobutton_150.png, tradiobutton_200.png
|
||||
tradiogroup.png, tradiogroup_150.png, tradiogroup_200.png
|
||||
tscrollbar.png, tscrollbar_150.png, tscrollbar_200.png
|
||||
tscrollbox.png, tscrollbox_150.png, tscrollbox_200.png
|
||||
tservicemanager.png, tservicemanager_150.png, tservicemanager_200.png
|
||||
tshape.png, tshape_150.png, tshape_200.png
|
||||
tsimpleipcclient.png, tsimpleipcclient_150.png, tsimpleipcclient_200.png
|
||||
tsimpleipcserver.png, tsimpleipcserver_150.png, tsimpleipcserver_200.png
|
||||
tspeedbutton.png, tspeedbutton_150.png, tspeedbutton_200.png
|
||||
tsplitter.png, tsplitter_150.png, tsplitter_200.png
|
||||
tstatictext.png, tstatictext_150.png, tstatictext_200.png
|
||||
@ -445,6 +466,7 @@ ttrayicon.png, ttrayicon_150.png, ttrayicon_200.png
|
||||
ttreeview.png, ttreeview_150.png, ttreeview_200.png
|
||||
tupdown.png, tupdown_150.png, tupdown_200.png
|
||||
tvaluelisteditor.png, tvaluelisteditor_150.png, tvaluelisteditor_200.png
|
||||
txmlconfig.png, txmlconfig_150.png, txmlconfig_200.png
|
||||
|
||||
menu directory
|
||||
|
||||
|
@ -54,7 +54,14 @@ actions/laz_edit.png
|
||||
actions/laz_export.png
|
||||
actions/laz_highlighter.png
|
||||
actions/laz_open.png
|
||||
actions/laz_openunit.png
|
||||
actions/laz_open_150.png
|
||||
actions/laz_open_200.png
|
||||
actions/laz_open_recent.png
|
||||
actions/laz_open_recent_150.png
|
||||
actions/laz_open_recent_200.png
|
||||
actions/laz_open_unit.png
|
||||
actions/laz_open_unit_150.png
|
||||
actions/laz_open_unit_200.png
|
||||
actions/laz_refresh.png
|
||||
actions/laz_save.png
|
||||
actions/laz_save_150.png
|
||||
@ -435,6 +442,8 @@ menu/menu_search_next_bookmark.png
|
||||
menu/menu_search_next_bookmark_150.png
|
||||
menu/menu_search_next_bookmark_200.png
|
||||
menu/menu_search_openfile_atcursor.png
|
||||
menu/menu_search_openfile_atcursor_150.png
|
||||
menu/menu_search_openfile_atcursor_200.png
|
||||
menu/menu_search_previous_bookmark.png
|
||||
menu/menu_search_previous_bookmark_150.png
|
||||
menu/menu_search_previous_bookmark_200.png
|
||||
|
Before Width: | Height: | Size: 635 B After Width: | Height: | Size: 557 B |
BIN
images/menu/menu_search_openfile_atcursor_150.png
Normal file
After Width: | Height: | Size: 824 B |
BIN
images/menu/menu_search_openfile_atcursor_200.png
Normal file
After Width: | Height: | Size: 1.1 KiB |