From adb7170dbfb86d1d953745364141393e9a1865ac Mon Sep 17 00:00:00 2001 From: ondrej Date: Thu, 10 May 2018 08:30:42 +0000 Subject: [PATCH] IDE: images: remove menu_help and use btn_help instead git-svn-id: trunk@57879 - --- .gitattributes | 1 - components/todolist/todolist.pas | 2 +- ide/idehelpmanager.pas | 2 +- ide/mainbase.pas | 2 +- ide/projectinspector.pas | 2 +- images/laz_images.res | Bin 606724 -> 605924 bytes images/laz_images_list.txt | 1 - images/menu/menu_help.png | Bin 749 -> 0 bytes packager/packageeditor.pas | 2 +- 9 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 images/menu/menu_help.png diff --git a/.gitattributes b/.gitattributes index 6864bc6195..52c39b35b8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7813,7 +7813,6 @@ images/menu/menu_goto_bookmark9_200.png -text images/menu/menu_goto_line.png -text svneol=unset#image/png images/menu/menu_goto_line_150.png -text images/menu/menu_goto_line_200.png -text -images/menu/menu_help.png -text svneol=unset#image/png images/menu/menu_indent.png -text svneol=unset#image/png images/menu/menu_indent_150.png -text images/menu/menu_indent_200.png -text diff --git a/components/todolist/todolist.pas b/components/todolist/todolist.pas index a8e6a78d66..cce410ae9a 100644 --- a/components/todolist/todolist.pas +++ b/components/todolist/todolist.pas @@ -244,7 +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'); + acHelp.ImageIndex := IDEImages.LoadImage('btn_help'); SaveDialog.Filter:= dlgFilterCsv+'|*.csv'; end; diff --git a/ide/idehelpmanager.pas b/ide/idehelpmanager.pas index f7db7fd9ee..479994ec0c 100644 --- a/ide/idehelpmanager.pas +++ b/ide/idehelpmanager.pas @@ -979,7 +979,7 @@ begin NodesTreeView.Images:=IDEImages.Images_16; FImgIndexDB:=IDEImages.LoadImage('item_package'); - FImgIndexNode:=IDEImages.LoadImage('menu_help'); + FImgIndexNode:=IDEImages.LoadImage('btn_help'); end; function THelpSelectorDialog.GetSelectedNodeQuery: THelpNodeQuery; diff --git a/ide/mainbase.pas b/ide/mainbase.pas index b9a40a8769..cffaa72eba 100644 --- a/ide/mainbase.pas +++ b/ide/mainbase.pas @@ -1444,7 +1444,7 @@ begin ParentMI:=itmOnlineHelps; CreateMenuItem(ParentMI,itmHelpOnlineHelp,'itmHelpOnlineHelp', - lisMenuOnlineHelp, 'menu_help'); + lisMenuOnlineHelp, 'btn_help'); CreateMenuItem(ParentMI,itmHelpReportingBug,'itmHelpReportingBug', lisMenuReportingBug, 'menu_reportingbug'); diff --git a/ide/projectinspector.pas b/ide/projectinspector.pas index 741cda8eaf..91a0f57c57 100644 --- a/ide/projectinspector.pas +++ b/ide/projectinspector.pas @@ -1063,7 +1063,7 @@ begin OptionsBitBtn := CreateToolButton('OptionsBitBtn', lisOptions, lisPckEditEditGeneralOptions, 'menu_environment_options', @OptionsBitBtnClick); OptionsBitBtn.DropdownMenu := TSetBuildModeToolButton.TBuildModeMenu.Create(Self); OptionsBitBtn.Style := tbsDropDown; - HelpBitBtn := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisMenuOnlineHelp, 'menu_help', @HelpBitBtnClick); + HelpBitBtn := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisMenuOnlineHelp, 'btn_help', @HelpBitBtnClick); AddBitBtn.DropdownMenu:=AddPopupMenu; mnuAddDiskFile.Caption:=lisPckEditAddFilesFromFileSystem; diff --git a/images/laz_images.res b/images/laz_images.res index c5b89251e85d4d693bd670011966b56814244b0a..3d1ba0788c7fa295ca6c975fd950020ae6b52ade 100644 GIT binary patch delta 41 rcmZo^QGN1PrJ;qfg=q_Oz?Sxc?aV;T0>rF9%m&2l+Y7dHOz8pudT$Z@ delta 798 zcmV+(1L6GS{Un5hC4hthgaWh!P_!NG0ssIo00030{|W$207U>!0962A07w8u089W- zmqES(H-EHAL_t(|UZqoANK|PUe&#fiVWno|j1!io2t{O2yA~zhL`6#w16|lubP>T) zOBZ<;Q9-r4ECqJuQjkAP?b;7giln7NR!W%DtZtg&RL)=iHoxb5=X~GWIYS;YFMZ(o z-uJtB-uHQ5cr8SPg}{m*&^^M|38G3N=!hO|LVpNwK_NZX>CwHfH1j>a!yE^lLrJGD zyuK#KYPS#v=NtwkNdn`*;8-Hag*bI^+p2rB8fi9ZABZ~@rqvd%lF?XK{iIlroapVfXm0qAc#;^(|`4? zo50qRTnvAhHpZ?ucc43HXnH;xuu8z*Evu1cwLsHU-066We>;a@KoTl;|6Gi;MG|hc z4g~bYH^2Z9rFis@C(c7x+G5WJg4FTGPnX<1bmD3&9sje1&ewL+<5xa<+W(0vPB+GO z{`QY^R%bjW51eau?mzo5P~Y}H^-&Io$>W#$v({uN$8rS?|S_r-Z%n7oI_g>u^00000NkvXXu0mjf0001o cP_zSwP_zVxP_zYyP_zbzP_zfPP_zh?ip{5Po&W#< diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt index d20de1465e..15fceb0678 100644 --- a/images/laz_images_list.txt +++ b/images/laz_images_list.txt @@ -356,7 +356,6 @@ menu/menu_goto_bookmark9_200.png menu/menu_goto_line.png menu/menu_goto_line_150.png menu/menu_goto_line_200.png -menu/menu_help.png menu/menu_indent.png menu/menu_indent_150.png menu/menu_indent_200.png diff --git a/images/menu/menu_help.png b/images/menu/menu_help.png deleted file mode 100644 index 418d20724a44f34d47d85145ec3d466203a6ee45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 749 zcmVCwHfH1j>a!yE^lLrJGDyuK#KYPS#v=NtwkNdn`* z;8-Hag*bI^+p2rB8fi9ZABZ~@rqvd%l-|zK9vIuNin~g|9#mCPva81A$oQ74B5KAf!bA&`v0TH0-WSX7}O8s}N zw_!S_;IGElkeLPopjiaSLWTpF1@w=fabD!eN=GD`fDoEafir)1!vI$`fCLBxyDbMv zMKzlG%>ufe`oMVnLTN!ZM#iSV3;}@4$I2jxP*v0Qt((Bsl3Wabm^Q|)H+P^rXlQyq z8n8;h-Yu(_OCJ&rzcJ4p>Fi_w2 zKlKiW$>W#$v({uN$ f8rS?|S_r-Z%n7oI_g>u^00000NkvXXu0mjf%c)pd diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas index b31d75a9d7..19fc64ad65 100644 --- a/packager/packageeditor.pas +++ b/packager/packageeditor.pas @@ -1955,7 +1955,7 @@ begin RemoveBitBtn := CreateToolButton('RemoveBitBtn', lisRemove, lisPckEditRemoveSelectedItem, 'laz_delete', @RemoveBitBtnClick); CreateDivider; OptionsBitBtn := CreateToolButton('OptionsBitBtn', lisOptions, lisPckEditEditGeneralOptions, 'pkg_properties', @OptionsBitBtnClick); - HelpBitBtn := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisMenuOnlineHelp, 'menu_help', @HelpBitBtnClick); + HelpBitBtn := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisMenuOnlineHelp, 'btn_help', @HelpBitBtnClick); MoreBitBtn := CreateToolButton('MoreBitBtn', lisMoreSub, lisPkgEdMoreFunctionsForThePackage, '', nil); MoreBitBtn.Style:=tbsButtonDrop;