diff --git a/.gitattributes b/.gitattributes index 2e8d516602..5866aeaba0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2512,6 +2512,7 @@ images/menu/menu_new.png -text svneol=unset#image/png images/menu/menu_pause.png -text svneol=unset#image/png images/menu/menu_project_add.png -text svneol=unset#image/png images/menu/menu_project_close.png -text svneol=unset#image/png +images/menu/menu_project_from_file.png -text images/menu/menu_project_inspector.png -text svneol=unset#image/png images/menu/menu_project_open.png -text svneol=unset#image/png images/menu/menu_project_options.png -text svneol=unset#image/png @@ -2535,6 +2536,7 @@ images/menu/menu_search_files.png -text svneol=unset#image/png images/menu/menu_search_find.png -text svneol=unset#image/png images/menu/menu_search_find_next.png -text svneol=unset#image/png images/menu/menu_search_find_previous.png -text svneol=unset#image/png +images/menu/menu_search_incremental.png -text images/menu/menu_search_jumpback.png -text svneol=unset#image/png images/menu/menu_search_jumpforward.png -text svneol=unset#image/png images/menu/menu_search_next_bookmark.png -text diff --git a/ide/mainbase.pas b/ide/mainbase.pas index bbc51879a8..4a65f81fe8 100644 --- a/ide/mainbase.pas +++ b/ide/mainbase.pas @@ -463,7 +463,7 @@ begin CreateMenuItem(ParentMI,itmSearchFindInFiles,'itmSearchFindInFiles',lisMenuFindInFiles, 'menu_search_files'); CreateMenuItem(ParentMI, itmSearchReplace, 'itmSearchReplace', lisMenuReplace2, 'menu_search_replace'); - CreateMenuItem(ParentMI,itmIncrementalFind,'itmIncrementalFind',lisMenuIncrementalFind); + CreateMenuItem(ParentMI,itmIncrementalFind,'itmIncrementalFind',lisMenuIncrementalFind, 'menu_search_incremental'); CreateMenuSeparatorSection(mnuSearch,itmJumpings,'itmJumpings'); ParentMI:=itmJumpings; @@ -554,7 +554,7 @@ begin ParentMI:=itmProjectNewSection; CreateMenuItem(ParentMI,itmProjectNew,'itmProjectNew',lisMenuNewProject, 'item_project'); - CreateMenuItem(ParentMI,itmProjectNewFromFile,'itmProjectNewFromFile',lisMenuNewProjectFromFile); + CreateMenuItem(ParentMI,itmProjectNewFromFile,'itmProjectNewFromFile',lisMenuNewProjectFromFile, 'menu_project_from_file'); CreateMenuSeparatorSection(mnuProject,itmProjectOpenSection,'itmProjectOpenSection'); ParentMI:=itmProjectOpenSection; diff --git a/images/laz_images.lrs b/images/laz_images.lrs index 699aefa656..17f20a99ad 100644 --- a/images/laz_images.lrs +++ b/images/laz_images.lrs @@ -1367,6 +1367,32 @@ LazarusResources.Add('menu_project_close','PNG',[ +#136#10'K{'#190'T'#251#199'@'#29#171'}'#24#185'y'#3#230#223#163'<'#214'f'#147 +#27#213#7#228'o'#241'_'#145'xO0'#251#252'G'#230#0#0#0#0'IEND'#174'B`'#130 ]); +LazarusResources.Add('menu_project_from_file','PNG',[ + #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a' + +#0#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167 + +#147#0#0#1#229'IDAT8'#203#141#146'Mh'#19'A'#24#134#159#217'&'#238#26#2'z'#241 + +#231'Rd-U<('#218'z.'#178#160'm'#208#139#218'F'#18#18#193#24#209#130'XmKE'#196 + +#179#26#171#235'-'#30#180#5#19'+$'#185'x('#177#209'S'#193#147#168#161#1'{'#17 + +'rhA'#161'P'#159'*7'#135 + +'Y|'#241#146#246#205#11'4'#142#132'e'#184#210#16'n'#220'g'#144#25#189')'#1'6' + +#4'u,'#203'b'#223#222#253#2#160'j'#223#144#143#181#0#159#191'h'#200#208'7' + +#222#165#186#229#129#177')'#1#160'y'#225#185#249#14'>~'#234#228#242#192#160 + +'pa'#128#140#145#231#244#185#24#139#13#7#17#8#210'>'#255#138#233#243#167#164 + +'28z'#178' _'#215#14#226#180#132'Yr'#12'b'#233'g'#210#133#227'YS'#246#246'E' + +#201#24'yv_'#26'R'#213'v'#212''''#1#208'"'#199#31#201#239'?'#12'Zw'#232'X=m' + +#236#220#181#137#173#219#182's,:)'#227'YS'#2#188'Yx'#138'k'#242'!r'#5'@'#221 + +#226#206#221'['#146'U'#244'v'#227#3'z'#251#162#184#6#0#157'[b'#148#138#5'F' + +#150#19'T'#156#16'#'#195#215'D'#0'`x'#240#170#15#142'gM'#5#151#138#5#204'C' + +#224#137#254#186#0#168#252#30#184#250#133#149#149'e'#0#206#140#237#241#193 + +#222#204'.'#236#149#239#27's'#185#188'z'#151#138#5#198'S'#179#232#186'A'#0#222'E'#211#154'+'#200#229 + +#242'X'#193#235#190'j\'#217'v'#25'7{Ow'#228#239#22#146#201#4'k'#201#182#203 + +#190#236#238#162#173'9'#131#245#12#221#236'>'#3']7H'#167#211#172#167#195#3#19 + +'xW\'#25#140#222#187#205#191'4'#244#240#189'X-'#254#19'c'#228#223#201'f'#138 + +#6'*'#0#0#0#0'IEND'#174'B`'#130 +]); LazarusResources.Add('menu_project_inspector','PNG',[ #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a' +#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167#147#0#0#0#9'pHYs'#0#0#11#18#0#0 @@ -2047,6 +2073,27 @@ LazarusResources.Add('menu_search_find_previous','PNG',[ +#241#223#159#233#159#3'~'#2'q'#11#242'~'#250#239'S'#193#0#0#0#0'IEND'#174'B`' +#130 ]); +LazarusResources.Add('menu_search_incremental','PNG',[ + #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a' + +#0#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167 + +#147#0#0#1#141'IDAT8'#203#221'S'#189'/Cq'#20'='#191#250#170'oK'#171'>R'#6#241 + +#205'P$'#188'Z$"'#254#0#137#24#12#22#155#196'` '#254#11#134'2'#214'D'#186#152 + +#12#22#139#180'D'#240'('#138#190#146'Gy$x'#137#190'W'#191#247#168'k'#18#130 + +#190#165#155';'#157'{n'#238#201#185'7'#247'2"B&'#145'mU'#148#227#202#132'x"' + +#205']'#200'q'#148'W'#185#237#202#181#204#203#10#178'QU'#225'h'#27#236#239';' + +#2#0'['#186#230#163#200'y'#243#141'r?'#247#248#164#210#193#238'6'#138#160'yN' + +'O'#194#208#141#20#21#228#231#135#131#161#173'NK'#7#145'X|jO'#12#131#155'&3S' + +' 5'#153#10#154#239'Y'#20'>'#151'Y('#180'E'#29'-'#181';BO7K'#235'@}'#214#198 + +'JJ'#139#241#246'j'#192#233#170'dK~?'#236#185'9'#172'07'#11'N'#151#139#249'|' + +#11#214';X['#13#224'I}'#4#215#147'H'#234#9','#250#230'1=3'#11'I'#146'`'#26#6 + +#232#253#205'Z'#160#198#237#198#208#200'(87pv'#188#15#175' 0OW7'#141'O'#206 + +#224#133#155#8#248'}_'#2#210'J/'#1'@'#221#240'&'#251#196#209'X5'#234#155#219 + +#161#220')8'#20'E455'#228#181'z'#4'$'#18#26#174#228'K'#28#30#136#0#0#246#253 + +#14#164#149'^'#170#27#222'd'#0' '#244#13#144#195'Q'#14']K'#224'6~'#133#198 + +#154'j'#251#205#131#202#201'f'#131#174'i'#136#157'E'#192'y'#146#165#29'!'#184 + +#177#206#254#160'q6d'#24#255'@'#0'D'#132#232#178#151#162#203'^'#250#137'?s+' + +#204'2}'#231#15#156#170#217#241#172#193'z1'#0#0#0#0'IEND'#174'B`'#130 +]); LazarusResources.Add('menu_search_jumpback','PNG',[ #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a' +#0#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167 diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt index d3753d6e96..7a605ea840 100644 --- a/images/laz_images_list.txt +++ b/images/laz_images_list.txt @@ -52,6 +52,7 @@ menu/menu_new.png menu/menu_pause.png menu/menu_project_add.png menu/menu_project_close.png +menu/menu_project_from_file.png menu/menu_project_inspector.png menu/menu_project_open.png menu/menu_project_options.png @@ -75,6 +76,7 @@ menu/menu_search_files.png menu/menu_search_find.png menu/menu_search_find_next.png menu/menu_search_find_previous.png +menu/menu_search_incremental.png menu/menu_search_jumpback.png menu/menu_search_jumpforward.png menu/menu_search_next_bookmark.png diff --git a/images/menu/menu_project_from_file.png b/images/menu/menu_project_from_file.png new file mode 100644 index 0000000000..f9f73cce82 Binary files /dev/null and b/images/menu/menu_project_from_file.png differ diff --git a/images/menu/menu_search_incremental.png b/images/menu/menu_search_incremental.png new file mode 100644 index 0000000000..39871c50db Binary files /dev/null and b/images/menu/menu_search_incremental.png differ