diff --git a/.gitattributes b/.gitattributes index 1373a54bf0..ac0ba7cafe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5023,7 +5023,6 @@ ide/findunitdlg.lfm svneol=native#text/plain ide/findunitdlg.pas svneol=native#text/plain ide/formeditor.pp svneol=native#text/pascal ide/fpcsrcscan.pas svneol=native#text/pascal -ide/fpdocediticons.lrs svneol=native#text/pascal ide/fpdoceditwindow.lfm svneol=native#text/plain ide/fpdoceditwindow.pas svneol=native#text/plain ide/fpdochints.pas svneol=native#text/plain @@ -5216,6 +5215,7 @@ ide/lazarusmanager.pas svneol=native#text/pascal ide/lazbuild.lpi svneol=native#text/plain ide/lazbuild.lpr svneol=native#text/plain ide/lazconf.pp svneol=native#text/pascal +ide/lazdoc.res -text ide/lfmunitresource.pas svneol=native#text/plain ide/macropromptdlg.pas svneol=native#text/pascal ide/main.pp svneol=native#text/pascal diff --git a/ide/fpdocediticons.lrs b/ide/fpdocediticons.lrs deleted file mode 100644 index ab7520f25a..0000000000 --- a/ide/fpdocediticons.lrs +++ /dev/null @@ -1,71 +0,0 @@ -{ Ceci est un fichier ressource généré automatiquement par Lazarus } - -LazarusResources.Add('formatbold','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#17#0#0#0#17#8#2#0#0#0#180#15#208 - +#173#0#0#0#9'pHYs'#0#0#11#18#0#0#11#18#1#210#221'~'#252#0#0#0'@IDATx'#218'c|' - +#243#242#6#3#137#128#137'T'#13't'#212#195#130#204#17#17#215#192#170#8#205#207 - +'L'#184#228#128'l8'#23#205#172#1#241#15'.'#191#225#243#15#154#223#6#218'?' - +#140#200'n%2~'#24#135'Y'#26#5#0#188'1'#31'2'#132'U'#208#209#0#0#0#0'IEND'#174 - +'B`'#130 -]); -LazarusResources.Add('formatitalic','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#17#0#0#0#17#8#2#0#0#0#180#15#208 - +#173#0#0#0#9'pHYs'#0#0#11#18#0#0#11#18#1#210#221'~'#252#0#0#0'cIDATx'#218'c|' - +#243#242#6#3#137#128#137'T'#13'd'#234'a'#193'%!"'#174#129#204'E'#246#2'N{' - +#224#138'&MZ'#133#230'g'#156'z'#150#173#188#4'aD'#133#235#17#235#159#188#188 - +'0'#136'%'#196#134#1#30'Kp'#234#193'c'#9'v='#248'-'#193#174#7#191'%@'#192#136 - +#28#142'hq'#194#128#26'-'#216#245#16#9#232#149#222#232#165#7#0#175'5''QA1' - +#195'H'#0#0#0#0'IEND'#174'B`'#130 -]); -LazarusResources.Add('formatunderline','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#17#0#0#0#17#8#2#0#0#0#180#15#208 - +#173#0#0#0#9'pHYs'#0#0#11#18#0#0#11#18#1#210#221'~'#252#0#0#0'NIDATx'#218'c|' - +#243#242#6#3#137#128#137'T'#13'd'#234'aA'#230#136#136'k'#192#217'@7'#163'q' - +#177#219#3#151#128'0'#208#184't'#247#207#208#211'3e'#250#10'8'#137#9#24'1' - +#211#14'r'#180'0`'#4'4v='#4#1#206't'#128#6#144#141'&'#199#30'z'#133'5'#0#153 - +#192'%1'#146#215#11'~'#0#0#0#0'IEND'#174'B`'#130 -]); -LazarusResources.Add('insertcodetag','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#17#0#0#0#17#8#2#0#0#0#180#15#208 - +#173#0#0#0#9'pHYs'#0#0#11#18#0#0#11#18#1#210#221'~'#252#0#0#1#208'IDATx'#218 - +'c|'#243#242#6#3#137#128#137'T'#13'T'#210'#'#204#254']'#152#229'-'#255#255 - +#183#140#31#223'r'#252'g'#198#167#135#143#229'/'#251#235'c'#151#215#215#158 - +'\'#219#182'w'#225#212#198#202#130'#k&'#204'mL'#189'~x7'#22'='#15#246'M'#154 - +'R_'#244'ho'#223#214#245'kn'#220'y'#247#241#243#223#27#143#222#242#178#243#10 - +#243's~'#251#243#255#193#185#221',?'#190#163#235#249#248#254#169'8'#255#183#5 - +#219#174'~'#249#242#255#253#251#191#140''#217#207'_y'#201#248#151#129#149 - +#137#217#213'L'#249#228#189'/'#147#250#187#209#245'<'#198'p'#234#242'{'#17 - +#30#222#7#183'>'#171#203#136#252#253#253#223#209'N'#155'YT'#249#228'3'#182 - +#227'W^'#190#247'%0'#185#18'M'#15#227#185'y'#9#203'w'#222'0R'#146'TW'#22#202 - +#237#222#229'n'#161#23'R'#214'!&'#194#10'5'#146#145#227#223#255#31#232'z6' - +#182#133#202#138#241#221#189#247#225#228#173#167#198#234#18'o'#5#140'#'#226 - +'B'#241#135'5'#243#185#11'/'#5#5'9N\{'#250#224#205#7#27']'#217#187#183'n'#153 - +#185#4'20'#252#193#163#135#177'8'#196'B_YLN'#138#239#241#171'O'#167#174'=' - +#227#231#224#16'UV'#231#16#215#4#202#201#200')'#24#155#219#176'0~@'#15#3'aq' - +#209'W'#223'~'#175#216'w'#173'j'#198#1#15'Se!a'#14'Q'#166#183'/'#206'o'#2#162 - +#29#11';'#202'S'#253'W/]'#203#192#200#133#172#135'%'#173#174#251#222#189'7' - +#204#235#167'`'#0'd'#0#185'@'#6#220#169 - +#152#0'j'#143#133#169#10#26'CD\'#3'W'#16'0'#142#166#3#186#233#1#0#239#129'>' - +#187#185'@'#5#24#0#0#0#0'IEND'#174'B`'#130 -]); - - diff --git a/ide/fpdoceditwindow.pas b/ide/fpdoceditwindow.pas index af8e4ca9e9..b2e403332c 100644 --- a/ide/fpdoceditwindow.pas +++ b/ide/fpdoceditwindow.pas @@ -224,6 +224,7 @@ procedure DoShowFPDocEditor(Show, BringToFront: boolean); implementation {$R *.lfm} +{$R lazdoc.res} { TFPDocEditor } @@ -1627,8 +1628,4 @@ begin Modified:=true; end; -initialization - // then the items - {$I fpdocediticons.lrs} - end. diff --git a/ide/lazdoc.res b/ide/lazdoc.res new file mode 100644 index 0000000000..5f865a7599 Binary files /dev/null and b/ide/lazdoc.res differ diff --git a/images/README.txt b/images/README.txt index 231b97c218..7a623c79f7 100644 --- a/images/README.txt +++ b/images/README.txt @@ -1,48 +1,48 @@ This directory contains all images needed by the IDE. -Images are stored in lazarus resource files (.lrs). Each icon is stored +Images are stored in FPC resource files (.res). Each icon is stored in png or xpm format. -bookmark.lrs - Icons for bookmarks -codetoolsdefines.lrs - Icons for CodeTools Defines Editor -components_images.lrs - Icons and pics for lcl components -laz_images.lrs - The icons for the speedbuttons, the menu (Open, Save,...), +bookmark.res - Icons for bookmarks +codetoolsdefines.res - Icons for CodeTools Defines Editor +components_images.res - Icons and pics for lcl components +laz_images.res - The icons for the speedbuttons, the menu (Open, Save,...), package windows, codeexplorer -splash.lrs - the lazarus logo at IDE start -unitdependencies.lrs - Icons for the unit dependencies. +splash.res - the lazarus logo at IDE start +unitdependencies.res - Icons for the unit dependencies. How to update the image resources: Creating a lazarus resource can easily be done by the lazres program. If you have not yet compiled lazres, go to the tools directory and type make. -1. bookmark.lrs +1. bookmark.res cd /images/ -../tools/lazres bookmark.lrs sourceeditor/*.png +../tools/lazres bookmark.res sourceeditor/*.png -2. components_images.lrs +2. components_images.res cd /images/ -../tools/lazres components_images.lrs @components_images_list.txt +../tools/lazres components_images.res @components_images_list.txt -3. laz_images.lrs +3. laz_images.res cd /images/ -../tools/lazres laz_images.lrs @laz_images_list.txt +../tools/lazres laz_images.res @laz_images_list.txt rm ../main.ppu -4. splash.lrs +4. splash.res cd /images -./tools/lazres splash_logo.lrs splash_logo.png +./tools/lazres splash_logo.res splash_logo.png -5. lazdoc.lrs +5. lazdoc.res cd /images/ -../../tools/lazres ../ide/lazdoc.lrs @lazdoc.txt +../../tools/lazres ../ide/lazdoc.res @lazdoc.txt diff --git a/images/bookmark.res b/images/bookmark.res index fcd6271960..f0c0820f1b 100644 Binary files a/images/bookmark.res and b/images/bookmark.res differ diff --git a/images/components_images.bat b/images/components_images.bat index 4a40c41fa9..e8b13e44c6 100644 --- a/images/components_images.bat +++ b/images/components_images.bat @@ -1 +1 @@ -..\tools\lazres components_images.rc @components_images_list.txt +..\tools\lazres components_images.res @components_images_list.txt diff --git a/images/components_images.res b/images/components_images.res index d75eb9a7a9..1b4c86b0e7 100644 Binary files a/images/components_images.res and b/images/components_images.res differ diff --git a/images/componenttreeview.bat b/images/componenttreeview.bat index f5f0133470..6e8c5bdc46 100644 --- a/images/componenttreeview.bat +++ b/images/componenttreeview.bat @@ -1 +1 @@ -..\tools\lazres componenttreeview.rc @componenttreeview_list.txt +..\tools\lazres componenttreeview.res @componenttreeview_list.txt diff --git a/images/componenttreeview.res b/images/componenttreeview.res index d5dafb3852..148f97088d 100644 Binary files a/images/componenttreeview.res and b/images/componenttreeview.res differ diff --git a/images/laz_images.bat b/images/laz_images.bat index 657170d052..ae0288a792 100644 --- a/images/laz_images.bat +++ b/images/laz_images.bat @@ -1 +1 @@ -..\tools\lazres laz_images.rc @laz_images_list.txt +..\tools\lazres laz_images.res @laz_images_list.txt diff --git a/images/laz_images.res b/images/laz_images.res index c2504dd758..70faae655b 100644 Binary files a/images/laz_images.res and b/images/laz_images.res differ diff --git a/images/lazdoc.bat b/images/lazdoc.bat index a538d4f37e..f3cfe03cd7 100644 --- a/images/lazdoc.bat +++ b/images/lazdoc.bat @@ -1 +1 @@ -..\tools\lazres ..\ide\lazdoc.lrs @lazdoc.txt +..\tools\lazres ..\ide\lazdoc.res @lazdoc.txt diff --git a/images/splash_logo.bat b/images/splash_logo.bat index bc91157af3..e286d54c06 100644 --- a/images/splash_logo.bat +++ b/images/splash_logo.bat @@ -1 +1 @@ -..\tools\lazres splash_logo.rc splash_logo.png +..\tools\lazres splash_logo.res splash_logo.png diff --git a/images/splash_logo.res b/images/splash_logo.res index a5f9ba19fb..f66417486b 100644 Binary files a/images/splash_logo.res and b/images/splash_logo.res differ