From 449c561861023d209bbb7e2a1310b767f3e71284 Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 27 Sep 2013 03:38:18 +0000 Subject: [PATCH] lcl: move dialog icons from Lazarus to FPC resources git-svn-id: trunk@42962 - --- .gitattributes | 2 +- lcl/dialog_icons.lrs | 291 ----------------------------------- lcl/dialog_icons.res | Bin 0 -> 7040 bytes lcl/dialogs.pp | 7 +- lcl/graphics.pp | 1 + lcl/images/dialogs/build.bat | 2 +- lcl/include/picture.inc | 25 ++- lcl/lazdialogs.pas | 10 +- 8 files changed, 37 insertions(+), 301 deletions(-) delete mode 100644 lcl/dialog_icons.lrs create mode 100644 lcl/dialog_icons.res diff --git a/.gitattributes b/.gitattributes index e301de5588..09f8b72099 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5849,7 +5849,7 @@ lcl/dbactns.pp svneol=native#text/pascal lcl/dbctrls.pp svneol=native#text/pascal lcl/dbgrids.pas svneol=native#text/pascal lcl/defaulttranslator.pas svneol=native#text/pascal -lcl/dialog_icons.lrs svneol=native#text/pascal +lcl/dialog_icons.res -text lcl/dialogs.pp svneol=native#text/pascal lcl/dynamicarray.pas svneol=native#text/pascal lcl/dynhasharray.pp svneol=native#text/pascal diff --git a/lcl/dialog_icons.lrs b/lcl/dialog_icons.lrs deleted file mode 100644 index 0907a5f2ed..0000000000 --- a/lcl/dialog_icons.lrs +++ /dev/null @@ -1,291 +0,0 @@ -LazarusResources.Add('dialog_confirmation','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0' '#0#0#0' '#8#6#0#0#0'szz'#244#0#0 - +#7#233'IDATx^'#205#150'yl'#21#215#21#198#191';'#243#198'o1~^'#222#195#198#216 - +#128#23'l'#192'6'#24#7#28' '#212#181'Y'#204#154#6#147#20#164'(JQ'#146'R'#210 - +#168#173#148#8#17#162'4'#244#9#10#5#148#191#146#22#8#144'P'#218#6#2#148#196 - +#168#193#193#5'b'#7#147'`6'#3#1'C'#192#198'6'#4#27#27#243#188#191'u'#153#233 - +#157#163#153#17#22'R'#161'Q'#165#246'J'#159#206#232'^'#205#249'}s'#238'6'#248 - +'_7'#246#184#128#146#18#151#169'9Z*b`K'#184#138#20#192#9' V'#3#244'2'#224'>' - +#131'R'#19#129'r '#221#19#170#169#174'v'#133#255'+'#6#210#202'\q,`'#254'-'#24 - +#150#143#30'9'#20'3'#11'3c'#10#243'F'#176'a'#206#24'8'#236'V'#2't'#245#249 - +#208#238#238#199#185#250';'#202#241#179'7'#251#27'Z'#238#1#10'v('#230#192#239 - +'['#202']=?'#216'@'#218#188#13#191#17'D'#182'n'#222#244#177#214#21'?'#157'*e' - +#143't>V'#205#26#191'wc'#251#193#211#161#195''''#174#250'dEx'#167#165#226#205 - +#247#254'#'#3'i%.'#139'b'#179'|'#156#155#153'4w'#221'ks'#162's'#210#19'U0%' - +#254#250#210'm\'#184'~'#23#238'>/'#186'z'#253'`'#12'p'#198'Y'#225#136#141'FA' - +'v2'#158#154'0'#2#25#169#9#4#184#222#210#137'w'#182#28#245'\nl'#175#132#199 - +#247'BK'#181#203#255'H'#3#185'K\Q'#30#143#249'L'#217#140#188'qkV'#204#138#178 - +'FIh'#224#224#157#135#206#225#220#213'V'#8#162#0'Q'#16'8'#152'A'#16#24#24#152 - +#145'EQ'#20#210#228'q)X'#182'p"2'#185#17'0'#140#245';'#190#12#30'<~'#249#154 - +#205#230''#178#254#128'+'#248'o'#12'(,}'#225#198#242'E3'#242#230'n'#248#213 - +'\'#179#10')'#175#186#138'-'#7'O'#243#196#12#162#10#215#12#16#156#145#140',P' - +#0#153#27#144'e'#5'|'#24#203#23'M'#194#194#31'eS'#255#154'mG'#3'?v'#169#178 - +#249#243#213'e'#0'St'#162#240' >}'#193#198#149#211#242#211'f'#175'}'#181#148 - +#224#239#239';'#133#247#246#215'r'#136#0'I2!*'#138#139#162'*'#201#144'Y'#149 - +'$'#169#253';'#217#132#251'}'#1'Z|' - +#18#215#213'[]'#180#253#244'&'#8#208'+6'#168#138'g'#234'[i'#188'tj'#182#141#9 - +'l'#153#177#6#160#160' ot'#18'=6'#220'v'#235'['#141#162#137'KK@'#9#7#2#17'5' - +#185'f'#142#182'#'#138#198#167#144#1']w:=T-J'#13#181#15#180'5'#155#238'v'#19 - +'#''#Q5\`'#24#0#131'#1a'#136'q'#174#11#26#220#144'aDxhQN'#207#29#134'i9I'#6 - +'<"'#203#248#234'r'#7'U'#11#10#168#143#195')G'#239'@'#0'`'#12'C'#227#162'U[' - +#14'c'#10#160#0#241#218#197#210#239#13'j'#139#138#193'0BQ$'#17'X[\%'#249#195 - +'13?Y'#131#200#136'D"'#248#226'\+'#218#186'|z'#133#6'U'#211#235#15#19'#v'#136 - +#25'l'#208'9'#192#128#238'>'#159'6h'#129#192#216' '#145#17#129#13#170'F~z'#2 - +#158#26#235'$'#176#14#175'8'#23#215'['#251#201#164#200#165#193#141#169#178 - +#243#220'tw{'#2#4'5'#12'0'#5#238#206'n'#15'u8'#227'm'#224'L'#208#138#22'H'#16 - +'(R'#18'#'#225#148'1'#14#2#235#170#189#209#141'['#157'>'#14#211#193#204#168 - +'$'#211'>$'#193'N'#6#224#238#241#130#241#0#195#0#19'.'#212'7'#221#163#193'1#' - +#157#4#7#23'#'#159#148'@7e$'#179'[E}'#222#201'@c'#135'W'#175#16#193#24#211'"' - +#137' '#200#24#30'O'#140'k-'#157#234#7']0'#12#240'$'#187#143#159'n'#244#2#192 - +#244#9'#'#6#223'RL'#15'F'#15'%'#219'Z'#217#140#157#199'oc'#247#137'6'#236#173 - +#189#7'Y!'#131#218'0Io'#198#219#147#199'&S'#199#209#218#6#175#28#145'w'#27 - +#187#192#230#245'W'#212#212'5'#201'='#253'~'#218'"Y#'#29#184#213#222'K,m%' - +#147#232#25#244#140'e'#197#169#250#149'L'#136#253#181#157'T'#9#170#136#254#14 - +'TQ'#18':'#166#179'R'#19#208'7'#16'@'#213#153#6'Ye'#26#21#168#175'v'#13#132 - +#195#242#190#191'V'#212'E'#24#128#151#159'.'#160#228#148#140#224#148#208#184 - +'j'#185'{H"H&'#129#132'`('#140'P8B'''#165#172'JVH'#10#185#1#150#206#24'G'#213 - +#252#228#159#151#248'z'#149#247#169'L'#221#128'v'#174'K'#171'v}v'#182#167#181 - +#179#159'_'#26#14'<_'#154#7#130#203#218#22#211'#'#7#16'D'#30#172'`('#132'P' - +#136#27' '#19#17'p'#138'1'#246#147#233#163#145#153#18#135#14#247#0'>8P'#219 - +#227#15'J'#171#30#186#142#239'T'#190#209#21#12'E6'#173#221'~'#220#27#226#128 - ,'EE'#217#152';%'#19#17#29#162#129'yb'#130#248#131'\'#28#232#11#134#225#231#10 - +'pQ'#21#184#200#132'f'#180'hB*'#230#20#166#209#243#186#157'_z'#253#129#208'&' - +#149'5'#200#128#174#155#159#175'z'#247'd]'#211#177#245#31'V'#5#20#0'?'#155'?' - +#129'k<'#141#209'W'#133#9'N'#165'~'#255'p#'#254'T'#209#132'mG'#154#177#173 - +#178#5'A'#213#0'U'#129#166#130#202#255'lQ'#22#158'+'#206#166'u'#176'i'#247 - +#137'@'#245#217#198'c*'#227'A'#166#9#131#26'S,V'#215#146#253#149#23#191#1'0' - +#254#173#151'J'#162'fMN'#167#197'S^s'#3#215#248#165#3#6'mM'#136#188#26#138 - +#182#207#31#252#29#147#145#157#26#143#249'S'#210#145#226#28#130#0#175#210#187 - +''#171#9#238#169#168#187'b6{'#151#168#140'G'#254#21#167'N{'#221'*%8'#247#230 - +'g'#167#150#174#255#245'|'#155#250'sI'#211't'#175#15#223#222#236'DCk7'#250'=' - +'!'#244#251#131#16#24#163#211'3'#214'f'#198'h>'#207'y'#233#14#12#231'`'#181 - +'5'#223#237#193#219'<'#226#171#171'o'#250#170#189#246'/'#203'}]'#141'n'#0 - +#190'G'#24' '#217#184#236')'#197'o'#188'f'#177';_nV'#129#229#149'g'#11'M' - +#163#134#197#129#225#209#237'{n'#244#163'C'#231#194#251#191'8'#31#240#185'om' - +'o='#181'm'#23#128'~M'#221'\'#242#163#12#152#185'bTY'#19'3'#135';r'#202'~)E;' - +#202#242'2'#147#217#188#162#28#235#164'q)lh'#188#13#177#209#22#128#129#246 - +#246#253'^/'#234#190'kS*N'#212#251#175'4'#180')'#254#254#182'J'#247#183#159 - +#254'9'#208#211#214#174#129#7#184#186#184'<'#143'Q'#1'c'#129'Fs'#217#213'(I' - +#182#24'{v'#233'T[bV'#169'd'#181#231#3'b'#172#194#4#27'%'#129#236#131#18#233 - +#11'z'#186#175'x;'#190#171#234'k'#172#170#11#135#253'*'#208#167#129'{4'#19'a' - +#252#192'&rY'#184#226#184#146#184'Fqer'#141#229#202#209'b'#150#214#159#204#21 - +#175'M'#163#9#255#239#237'_'#158#237#179#2'6'#207#146'>'#0#0#0#0'IEND'#174'B' - +'`'#130 -]); -LazarusResources.Add('dialog_error','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0' '#0#0#0' '#8#6#0#0#0'szz'#244#0#0 - +#5#204'IDATx^'#213#151']l'#28'W'#21#199'w>'#246#203#187'^'#239':'#187#182 - +#131#19#20#19#215#31#9#197'I '#168'T|'#132#151#166#14'U'#160#5#191#208'B'#222 - +'*'#129'Z'#169#2#193'C'#145'x'#229#1#161#2'B'#2#30#144#130'DQCQ+'#28'\'#7#158 - +#16#20'*'#153'41'#177#147#216#202''''#9'v'#214#27'o'#188#235#157#221#217#153 - +#157#185'x'#164#209'*'#155#201'dq'#223#248'KGg'#246'hu'#207#239'?'#247#206 - +#236'Y'#254'o4'#11#217'?'#192#11#179#154#246#206'l$rmFU'#203#211'B4'#189'|F' - +#215#175#206#170#234#233'i'#248#234'i'#200#176#13#9':h'#26#134'5U'#253#137#11 - +#159#203#245#245#185#3#251#198#19#201#129'~'#162#153','#145't'#10#171'\'#193 - +','#149'0V'#239#176#186'x'#177'V,'#20'T!'#229#159'm)_9'#14'W>0'#192')'#136'$' - +#21#229#199#192#137#189#7#15'D'#246#28'}JQ'#155'6'#220'-'#129'a@'#195#2#239 - +#179#166'CT'#135#174'.'#232#205#224'h'#26'Wg'#206#184#215#254'u'#161#129#148 - +'''o'#185#238#203'/'#130#189'-'#128#25#200'!'#196#153#29#249#252#216#227'_{>' - +#22'q'#154'p'#253'&'#212#205#0#168'|'#240':'#17#135#15#15'b'#169#10#243#191 - +'~'#221','#21#239'.'#186'R'#30'}'#6#238#254'O'#0#222#30#10'!.'#12#141#141#245 - +#141'|'#229'9'#141#165'%'#216#168'<'#178#169#148'2P'#167''''#13'#C,'#191#249 - +'v'#243#230#165#165';'#134#148#251#167#160#252'H'#128'S'#160#166#132#248#251 - +#208#232#232#193#225#231#190#168#177'p'#17#204'F'#208#165#223#244#161#245#251 - +'AbQ'#196#190'a'#174#190'u'#218#254#247#229#229#185'M)?3'#5'N('#192#172#162 - +#252'`G6'#243#242#193'o'#188#24#151#243#139#208'h<'#210#165#12'k|'#223#247 - +#137#232'('#19#227#204#255#252'W'#181'R'#233#222'k'#147#174#251#234'C'#1'~' - +#15#3'IE'#185't'#228#149#151#210#202#173#21#168'l'#6#154#6#154#5#155#6#129 - +#164#132#238'$r'#176#143''#252#244#151#27#13#215#29'='#14#5'|i'#248'J('#202 - +#143#30#27#31'K*'#150#141'['#174#132#184#12'l'#195#195#129#30#172'W'#170'(' - +#205'^v'#143'>'#150#188'yy'#249#135#184#238#11'm'#0#167' '#237'Jy|'#231'3O' - +#171#206#226#18't'#184#181#15#5#10's'#239#203#185#177#194#206#167'?'#175']' - +#187#180#244#236#12'|s'#18'*-'#128'8'#28#235#205'f'#28#225'88'#13'+'#204#165 - +#159'C\'#10#17#172#11#1'~'#198#178#209#133'B'#186';'#229#150#202#149#167#128 - +#223#181#206#192#172#16#211'#'#159#252#248#23#250#247#237'G'#254'g'#21#25'\<' - +#224#222#175#7' '#253'@'#4#161'Q'#7#251'('#188#255'>'#215#207'/'#190'}L'#202 - +'/'#181#182'@'#194'hb'#247'.'#220'Z'#205#163#245#2#188'x'#227#141#192'3+'#216 - +#158#234'SS'#30' '#8#129'[o'#16#255#208#0#226#252#226'X'#219#25'p!'#23#201 - +#231#144#133'u'#164#162#180#136#21':'#200'w'#239#186'n'#235'Z'#8#129#162'(^' - +#6'h'#173#7#224#218'M'#244#222#30'$'#228#218#1#164'L'#234#217#12#238#202'Z' - +#11#160#179#240#26'{'#17#0'r'#28#7#192#3#241#214#6#31#2')'#209#211'I'#175#150 - +'j'#3'P'#132#168'Z'#134#145'V'#244#8#210#241#221#0'*'#225#242#154'H);'#2#214 - +#206#158'E'#31#26'B'#205#231'A'#215'1'#11'E'#132#16#155'H'#217#2'@'#192'Z' - +#189'XLw'#197'"'#184#141#198'6\w'#150'S'#171#209'\X@$'#18#232'{'#6'1'#165#141 - +#128#226#131'/'#162#203#213'+'#215#135#187#14'L 7'#141#214#233'6O'#156#240'\' - +#130#148'4'#11#5#236#27'7'#144#134#209#246#220#251#17'xe'#7#234#134#129'j'#26 - +#212'*U\'#184#216#6#208#148#242#183#133#133#139'Gr'#159'8'#144'l;4'#213'*N' - +#177'Hse'#197'{BB^'#181#193#154'_'#15'@('#253'Y'#202'K'#215'7'#221#173'~m'#0 - +'&'#204'T6'#171#170'u'#235#26#246'?/!%'#222'V M3'#232#178#179#251' '#144#148 - +'('#137'(RW0'#204#134#6#204#6#230#129'?*'#202'ov'#14#228#167#242'C'#187'4s~' - +#9#194#22#255#128#238#227#19'{)]'#185#221','#21#214'_?'#6'_'#15#252#24#153 - +#174#251#237#213#149#194'dnb'#164'Gd'#186'qJ'#229'p'#247'!.'#9#249#190#154'M' - +'A"'#194#250'Z'#169#234#192'wB'#231#129#153#173'y '#17#139#190'4|'#244#201 - +#132#241#215's'#184#166#181'-'#247#0#178#29#16#17#143#146'zr'#31'7'#255'4gX' - +#150#237#205#3#223#3#8#220#1#128#170#235#190'*'#235#230'go'#255#237#220#161 - +#129'''>'#170#27#239'-'#224#214#204#240'['#219#225'Lx'#251#222'ux'#132#149'w' - +'/Xf'#195':_'#147#242#251#29'g'#194#183#160'G'#131#133'l.'#147#31#252#244#1 - +#221'8{'#153#230#221'r'#136#203#240'1M'#203#165#233#154#248#8#171#239'.'#216 - +#155#235#229#213':<'#30'2'#19#6'5'#13';'#4#204#198#227#177#241#221'G'#14#197 - +'e'#205#164#190'x'#3#199#168'wt'#175#166#18#196'G'#7#17#241#8#183#255'2_'#183 - +'M'#235#130#5#147#207#194#250#182#254#23#252#2#244'~'#248#153'"'#196#243#153 - +#190'l4x\'#193'l'#208#184'S'#162#185'a'#224#154#13'\'#219#1']E'#137'EQ'#211 - +#9#244#254#12'JDemn'#185'Y^'#187'g[p'#242'$|k'#26'j'#132'H'#132#212#146'@' - +#151#151#191#12#222#12#247#221'n8'#28#139'G'#157#238#254'l<'#214#219#141#150 - +'J'#160'u'#197#176#141':'#141'r'#13#171'Ta'#227#206#189'-'#199#13'u'#3#230 - +#222#132#215'N'#195'2P'#5#140'V'#238#12'@'#194#7'H'#221#159'wA'#255'$<1'#1 - +#159#234#134#254'($5'#136'4'#193'6'#161#186#1#197's'#240#222';0'#183#2#5#191 - +#225'&~'#246#227#30#161'cy'#16#162#251#190';'#145#240's'#220#143'('#16#1'T@' - +#250#139#218#128#9#212#129'Z+'#252#198'~v'#216#166#132#223'('#5#228#129#221 - +#192'^`'#28#248#24'p'#200#207#251#129#17'`'#15#176#19#232#1'b'#128'J'#7#253 - ,#23','#191'_v'#226'Q'#144'M'#0#0#0#0'IEND'#174'B`'#130 -]); -LazarusResources.Add('dialog_information','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0' '#0#0#0' '#8#6#0#0#0'szz'#244#0#0 - +#6#233'IDATx^'#213#150'[lT'#199#1#134#255#153'9'#231#236#205'k'#188'8'#224#11 - +#134'Z'#152#148#184#16#183#16#10#18'i!QhIRU'#9'J'#173'&'#13'"`'#176#5'I'#148 - +#226#132#166#164'U%ZAR5MT'#181'R'#147#150#138#242'V'#192'r'#213'('#128#9#152 - +#20#131#9#152#130'!'#16#223#176#241#221#187'k'#239#197#222#181#247'r'#174#211 - +'9'#233'>'#248'%'#200#203#229#161#159#244#237#204#238'Y'#205#252#250#207#236 - +#5#255'WT'#214#214#186'6W'#215'>_'#181#253#173#143#182'l'#223'='#178#165'zW' - +#202#214#158#219#175#217#215#236#247' '#11#8'fH'#213#182'7j@'#217'o'#11'J' - +#151'(%e'#21#158#194#130#2#184#221#10'$J`'#153':'#194#225'0'#250#186'o$'#251 - +':'#174#169#220'4v'#31#248#219'{'#189''''#1'*+'#247'(^_'#186'.7'#238#19#21 - +#171#159#241'@'#206'Ap<'#129'h"'#9#221#208#0'bA'#150#128'"'#159#27#229'%>xd' - +#224#147#163#255'J'#6#135#6#26''''#199#157#149'uu{4'#220#6#9#183#135'x}j'#221 - +#3#165'K'#214'/}'#228'{'#142#222#209#20'L>'#142#210'B'#25#15'/'#204#197',' - +#143'l'#201#140'Yi'#205#224#19#9#205#234#9'F'#185#161'sV'#249#252#11#238#198 - +#211#255'~'#178#163#245'R'#29#128'g'#133#252#142#26#168#170'~s'#187#183#160 - +#244#189#138'G7'#184#187#253')'#148'/'#144'PV'#236#132#196'`QBLB`kq'#11#220 - +#228#28'\'#216#218#27#209''''#166't'#246#236#170#133#158#195'u'#245#234#240 - +#205#246#215#15#236#255#221#135#248#10'('#190#130#205#155'w'#230#129#209#189 - +#139#31'y'#218#221#27'Lc'#229'b'''#22#205#179'7'#135'I)'#209'('#129'F'#132'"' - +#136'J(Q'#191#28#9#212#242#249'y'#150'i'#154#241#211#159#15#197#159#219#240 - +#140#131'Ht'#175#189'V'#214#1#168'B_'#156#179#224#155'n'#213#146'Q'#156'O0' - +#215''''#129#0#6#8#215#9#17#1#24'Q'#25#177'7'#134#24#145#150#24'I1J'#210'nER' - +#243'r'#28#201#201#148'61'#169#26#234#138#213'k'#220#246'ZY'#7#0'u'#188'T' - +#176#224'!Wt*'#141#175#21'*'#176'`'#153#132#138#205'A4'#2#174#17#2#213#222 - +#144'R'#154#18'a'#210#228#203#16'4'#201'D'#16#135'L'#167#156#10'M'#244#7#227 - +#177#21#203#151'K'#160#202'K'#217#31'B'#203','#203#241#230'a8'#152#128'Cv'#0 - +' '#6'8'#209')'#131']'#183#198#8#213'D '#131#130#232#0','#139#18#206'-'#14'U' - +'7Mq='#230'T$'#215'DB%'#243#230#148#204#1'7'#23'f'#29#128's'#211'+'#201#18'L' - +#174'"'#165#153#154'S'#150'D'#245#208#236#6#168'}'#207')'#212#255#133' '#6'@' - +'L'#9#176'tn'#17'q'#0'CN'#7#227'"'#132#149#210'M(2#'#220#178#188'Y'#7' T'#138 - +#131#171#249#148#26#24#10'%'#210'y'#30#197#4#168']'#189#221'@'#154#130#164 - +#153#8'B('#213')'#129#193'-nER'#250#152'f'#24#170'S'#162'.B'#8#23'2'#14'X"p"' - +#235'3@'#8'k'#155#140'G0'#219#171'h'#161#137't2'#18'KO'#2'P'#9#136'}'#239'S' - +#148'!'#197#24'IJ'#20'S'#154'a'#6#198#226#169#27'i'#195#24#249#250'<'#223'lQ' - +#255#148#147#210'T'#209'l'#183#20#141'M'#166')'#149'z'#178'n'#192'4S'#31#12 - +'w_['#246#240#234'u'#210'@8'#174#245#135#19#227'O'#174'('#249'F'#255'h'#188 - +'/'#28'O'#251#21#198#198'!!'#206#13#30#181#155#144#197#3'K'#4'*'#167'F'#131 - +#229#14#185#240'C'#206'9[T'#232'+ji'#185#144'0'#184#254#15#220#1#164'j'#251 - +#238#182#191#212'_'#156':t'#166'o'#248#143#31#183']'#234#13#196#6#147')m2' - +#153'J'#167#6#253#225#235#237#183#134#143']'#185#209'u'#232'Z'#251#205#143 - +#219#187#186#219#7#7#7#141#11#151'.w4}'#225''#167#173'7'#214#216';'#28#31 - +#171#222#241#243#145#154#154#26'7'#238#132#173'[k'#23#137#5'"'#245#141#215 - +#195#199'ZF'#218#142#156#235'='#17#142#165#250'/w'#5#15#15#6'C'#205'c'#225'h' - +'g('#20#30#24#242#7'z'#186#186'z'#206#15#142#248#255's'#189'/R{'#203#159#248 - +'g '#148#10#213#254#236'7'#145'M'#213#187#214#221#213#143#209#166'm?'#173'p)' - +#174'O'#159#219#180'5'#201'eO'#207#188#217#14'N'#24#11#138'&'#218'<.i'#220 - +#237'`q'#133#201'I'#153#232'K'#9'sZ'#241#180#1#175'Cyy'#223#190#183#229'x,' - +#182#227#192#254#247#235'q'#183'TU'#239'|j'#207';'#14'\'#238#30#191#218'xe' - +#228#239#173#157#253#199#175#220#28'}'#179'{db'#171'?'#156#220#16#136#198#158 - +#254#236#226#197'?'#4'"'#147'?'#26#27#215#14#158'='#255'y'#207#150'm'#187#246 - +'b'#6'P'#204#0'b'#145#150'Q'#255#240','#183#204'\'#6'7'#211#254#145#192'dd' - +#212#159'O(5'#168#194#245#230#211#141#197#254'@'#160'G'#145#228')Fh'#225#192 - +#192#16#225'0Zq/'#169#222#177#251#226#169#230#142#174#203#157'c'#159#28'i8u' - +#226#221#247''#223'v'#170#233#248#137's'#159'}T'#183#231#215'o|'#218#218#218 - +#248'z4'#166#190'0'#17#179#6'^y'#237#151#225#154#154#157'E'#247#244#31#145'}' - +#22'<'#174#156#179'['#182'mr'#25'FB'#185'z'#229#28'JK'#231#194#169#0#163#254 - +#0#190#189#234'Q'#228#230'>'#200#143#30';9|'#177#229#202#177#253#31#188#187 - +#227#158#6#176'yq'#211#15#143#206#242#149#255#224#177#181'kQ^'#190#24#185'^' - +#15#24#147'@'#9#16#137#134'p'#252#216'I'#180#183'w'#244#143#5#149#135#26#26 - +#254#164'b'#6'H'#200#130#130'9'#227#223']'#187'F'#133#197')'#142#28'9'#132'H' - +'('#14#221'0'#145#147#227#128',i'#24#143#222#210#162#225'N'#179#161#161'C' - +#197#12#161#200#2#255#200#20#251#162#173#19'+W'#186#241#202#142#149'x'#235#23 - +#143#227#213#151'W'#224#169#239#207#193#19#143#231'ciy'#158#226't:'#203' ' - +#184'/'#1'L'#211'x;4'#150#196#153'3'#231#161'8'#20#248'|'#179'P2.'#202#30',' - ,#193#217#179'-h'#235#184#5']'#215#15#223#183#0#140#145'}'#203#150#205'Ge'#229 - +#171#144#152#12#27'M3'#208#217'9'#136#138#138#10',)/'#131#203'%'#255#248#190 - +#5'PU+'#217#211#19'@C'#195'^\'#191'~'#21#163#163'!'#132#194'Q'#228'?'#224'E_' - +''#31':'#187'z'#145'H'#164#251'V'#173#154#157#11#128#221#171'C(e'#148'GG' - +#227#143#165'Rz'#205#181'k'#225#159#0#220#205#24#5#231#150#208#30'Y'#132#243 - +#228#201'K'#151#130#191#26#27#139'9'#1#200'B]hdFa'#246#31'C%'#163''#225'\a'#177#176'T'#184#184#184#184#248';'#133#133#133'k'#1 - +'|KX!,'#23'.'#20#206#19#22#8#243#133'^'#161'|'#215#223#132#211#154#144'2M' - +#208'i'#218'X'#211'4'#132'ff'#206'q'#27#254#11#212#248'J&l'#255#144#31#0#0#0 - +#0'IEND'#174'B`'#130 -]); -LazarusResources.Add('dialog_warning','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0' '#0#0#0' '#8#6#0#0#0'szz'#244#0#0 - +#4#217'IDATx^'#237#149'khSg'#28#198''#231'='#231'$''Imb'#211#198'YW['#210'X' - +#175#21'Cl'#17#173#245#210'@'#171#253'R''l'#226#165#237#192#15'Z(L'#139#226 - +#21#235#220#198'@'#145'n~'#16#196'i'#29#27#3'?*'#136#23#188#130#160#136#136 - +#138'T'#197#13'E'#180#22'AIS'#215#180'1'#231#236'5,5'#24#10'Z'#219'm'#31#246 - +#192#195#255#189#28'x'#158#255#255#252#223#247#229'c'#240'?'#142#130#218#10 - +#26#255#6'~'#130#150'#'#16'm'#135'^'#201']'#252#147'h'#135#218#223#188#222 - +#215#247#155#155#173#251'MM'#214'onw'#255'aX'#206#16' '#134'RvEQ'#218#166#175 - +'X!'#172';w'#224#193#3#166#214#213'i'#2#246#252#8#246#17'7'#208#3#245#222'`' - +#176'(KU'#149#232#249#243'D'#207#158#197#157#147#163'd'#7#2#222',h'#26'Q'#3 - +'G'#193#161#170#234#247'%55Z'#247#241#227#136#220'\'#144#140#158':'#197#164 - +'p'#216'&'#20'e'#231'a'#240#140#152#129'?'#161'ylE'#197'h'#189#171#139'>Yzc' - +#203#22#28';w'#18#235#232#192#232#235#195'WZjW`'#243#136#24#248#21'F'#171#134 - +#177'='#176'`'#129#222'}'#226#4#234#180'i'#232#181#181#216#194'a'#180#153'3' - +#137#158'9CqE'#133'Mh'#218'W'#135#160'`'#216#13#244#195#182#130#170'*'#187')' - +#27'/'#222#217#137#177'q#'#138#16#0'86m'#162#255#201#19#212#167'O'#201#15#133 - +#20#1#223#13#171#129'7'#25#217#221#238#230#162#178'2=z'#250'4'#250#188'y'#232 - +#179'g'#163'(J'#146'z0'#136'm'#209'"'#162#23'/R'#24#12#234#194#225'X~'#24'J' - +#135#205#128#128#239#138#170#171#149#254'+WHD'#163#24#27'6$'#133#129#129#232 - +#148#21#145'{'#152'w'#239'RXVf'#10#216';,'#6#14#194'4'#199#152'1'#203#243'KJ' - +#180#158#11#23#176#213#213#161'M'#158'L"'#145#160#187#187#155'H$'#130'i'#154 - +#168#133#133'8V'#173#226#213#213#171#228#7#2#154#230'v/<'#4#11'?'#218#128#6 - +'{'#139'kk'#173#152'<'#243#150'e'#225'X'#183#14#128'N'#217#7#193'`0I9NV'#194 - +#217#220#140#165#170#196'o'#220#192'_^'#142#6'm'#22'(C6'#208#14#149'Y~U'#174 - +#215#171#202#204#176'74 '#242#243#147'b.'#151#139#20#228'8'#185'&'#188'^\MM' - +#244#222#190'MnN'#142#176#249'|'#147#218#225#139'!'#25#176'@'#145#248'a'#226 - +#226#197#188#146#141#167'dea'#172'Y'#147#250#231#25#6'R'#253#224'\'#189#26 - +#145#151'G'#236#250'u'#138'C'#161#228#21'}'#20'l'#31'l'#224#8'|'#230#153'>' - +#189'4'#203'4E'#239#173'['#216#215#174'Ex<'#3'B'#14#135#3'UU'#147'4'#12'c' - +#224'D'#8#167#19'WK'#11'}'#191#255#142'['#8#197'5~'#188#239#21#172#253' '#3 - +#173#160#9'U'#221'S'#18#14#139#158#147''''#147'e7'#234#235'S"o;_'#138'I&'#231 - +#233't~'#254'9'#250#196#137#244#202'*'#248'KKuU'#136#175''#129#236#247'6P'#8 - +#171'}'#179'f'#141#179'?'#174#244#253#241#7#142#245#235#17#134#145#202'~ fg' - +'g#'#153'aLh'#26#217#219#182#17''#246#12'G$'#130#219#239'7'#18#176#249#189 - +#12#252#12'.'#213'0'#190#245'WV'#234#242#145'A'#155'2'#5#163#174'.C\2'#189#2 - +#25'{'#142'p'#24#251#156'9'#196#228#239'+'#154'0'#193#166#232#250#250'#0.' - +#243#148#189#3#19'Z'#10'*+G'#9'y'#161#196#187#186#200#222#189#27#132#200#16#0 - +'8v'#236'X'#198'Zz5<;v'#208'U]'#141'M^'#209'y'#129#0']'#29#29#223#0'_'#14'Z' - +#129'C'#144'gs'#187'7'#21#134'B'#186'|'#231#209'e'#6#250#220#185#25#226#169 - +'qcc#'#245#245#245#25#251')'#218'g'#204#192#181'd'#9'}'#247#238'1.?'#223'&' - +#12#163#190#29#166#14'j@'#133#237#227#171#170'4'#243#218'5'#18'==8'#229'##' - +#133#6#165#174#235#8'!'#210#197'3Lz'#182'nM^`'#202#163'G'#140#13#4'L'#222#185 - +#162#149#180#236#253#14#159#239'~yC'#131#26#217#183#15#189#166#134'Qmm'#131 - +'f'#159'9'#31'|'#237#133'l'#200#238#3#7#176#205#154#197#173#155'7'#205'xO' - +#207#130'F'#184#148#222#3#168#176#171'h'#254'|+~'#249'2f,'#134#177't)twc'#165 - +#154'Or`'#156'NH'#237#13#250'M'#214#178'eD'#246#239#199'|'#248#144#252#130#2 - +#235'qG'#199#30#160'<'#221#128#176#160#214'W\'#172'E'#207#157#3' "'#31#150 - +#225'F'#226#229'K<'#5#5#234'C'#8#181#130'!'#25'K'#25'p'#190#134'g'#157#151'.' - +#141#250't'#229'J!t'#29','#11'+'#145#0#211'LFI'#144#180#228'<'#25#211#199#153 - +'{'#153'k2'#202#202#242#236#241'c'#203#130#23#173#160#164#247#128#171#9#22 - +#134#224#160#0#31'#'#8#19#158#223#134'5mp'#28#136'+'#188#133#7#24'='#9'>Q' - +#193'0Ac'#152' '#224'5'#160'$ v'#23#158#2']@/d'#190#213'*`'#0'v@'#12'o'#226 - +#196#129#254#191'i'#241'_'#193'_2'#162#158#155':='#253'`'#0#0#0#0'IEND'#174 - +'B`'#130 -]); diff --git a/lcl/dialog_icons.res b/lcl/dialog_icons.res new file mode 100644 index 0000000000000000000000000000000000000000..cc8d0cc6bde44b7336ddea19d55b57af5e274899 GIT binary patch literal 7040 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 CdguWF literal 0 HcmV?d00001 diff --git a/lcl/dialogs.pp b/lcl/dialogs.pp index 3b68c5a8ae..ddee3c6219 100644 --- a/lcl/dialogs.pp +++ b/lcl/dialogs.pp @@ -540,6 +540,7 @@ procedure Register; implementation +{$R dialog_icons.res} {$R forms/finddlgunit.lfm} {$R forms/replacedlgunit.lfm} @@ -692,7 +693,10 @@ begin if (idDiag < Low(DialogResName)) or (idDiag > High(DialogResName)) then Result := nil else - Result := CreateBitmapFromLazarusResource(DialogResName[idDiag]); + begin + Result := TPortableNetworkGraphic.Create; + Result.LoadFromResourceName(hInstance, DialogResName[idDiag]); + end; end; {$I lclcolordialog.inc} @@ -720,7 +724,6 @@ initialization InterfaceBase.InputDialogFunction := @ShowInputDialog; InterfaceBase.PromptDialogFunction := @ShowPromptDialog; InterfaceBase.QuestionDialogFunction := @ShowQuestionDialog; - {$I dialog_icons.lrs} finalization InterfaceBase.InputDialogFunction := nil; diff --git a/lcl/graphics.pp b/lcl/graphics.pp index f26cdf337f..db76e73f0c 100644 --- a/lcl/graphics.pp +++ b/lcl/graphics.pp @@ -977,6 +977,7 @@ type procedure LoadFromClipboardFormat(FormatID: TClipboardFormat); procedure LoadFromClipboardFormatID(ClipboardType: TClipboardType; FormatID: TClipboardFormat); procedure LoadFromFile(const Filename: string); + procedure LoadFromResourceName(Instance: THandle; const ResName: String; AClass: TGraphicClass); procedure LoadFromLazarusResource(const AName: string); procedure LoadFromStream(Stream: TStream); procedure LoadFromStreamWithFileExt(Stream: TStream; const FileExt: string); diff --git a/lcl/images/dialogs/build.bat b/lcl/images/dialogs/build.bat index 779d5067bd..7934ea5908 100644 --- a/lcl/images/dialogs/build.bat +++ b/lcl/images/dialogs/build.bat @@ -1 +1 @@ -..\..\..\tools\lazres dialog_icons.lrs dialog_confirmation.png dialog_error.png dialog_information.png dialog_warning.png +..\..\..\tools\lazres dialog_icons.rc dialog_confirmation.png dialog_error.png dialog_information.png dialog_warning.png diff --git a/lcl/include/picture.inc b/lcl/include/picture.inc index 7a791020c5..de18406ce4 100644 --- a/lcl/include/picture.inc +++ b/lcl/include/picture.inc @@ -514,6 +514,29 @@ begin end; end; +procedure TPicture.LoadFromResourceName(Instance: THandle; + const ResName: String; AClass: TGraphicClass); +var + NewGraphic: TGraphic; + ok: Boolean; +begin + NewGraphic := AClass.Create; + ok:=false; + try + NewGraphic.OnProgress := @Progress; + NewGraphic.LoadFromResourceName(Instance, ResName); + ok:=true; + finally + // this try..finally construction will in case of an exception + // not alter the error backtrace output + if not ok then NewGraphic.Free; + end; + FGraphic.Free; + FGraphic := NewGraphic; + FGraphic.OnChange := @Changed; + Changed(Self); +end; + procedure TPicture.LoadFromLazarusResource(const AName: string); var Stream: TLazarusResourceStream; @@ -678,7 +701,7 @@ begin GetPicClipboardFormats.Add(FormatID, AGraphicClass); end; -class procedure TPicture.UnRegisterGraphicClass(AClass: TGraphicClass); +class procedure TPicture.UnregisterGraphicClass(AClass: TGraphicClass); begin if PicFileFormats <> nil then PicFileFormats.Remove(AClass); if PicClipboardFormats <> nil then PicClipboardFormats.Remove(AClass); diff --git a/lcl/lazdialogs.pas b/lcl/lazdialogs.pas index 07c8c9c87f..9ec4d6ffdd 100644 --- a/lcl/lazdialogs.pas +++ b/lcl/lazdialogs.pas @@ -8,7 +8,7 @@ uses // RTL Classes, SysUtils, math, // LCL - Forms, ShellCtrls, Buttons, StdCtrls, ExtCtrls, FileCtrl, ComCtrls, + Graphics, Forms, ShellCtrls, Buttons, StdCtrls, ExtCtrls, FileCtrl, ComCtrls, Dialogs, ButtonPanel, LCLStrConsts, FileUtil, Controls; type @@ -345,19 +345,19 @@ begin case DlgType of mtWarning: begin Caption:= rsMtWarning; - image1.Picture.LoadFromLazarusResource('dialog_warning'); + image1.Picture.LoadFromResourceName(hInstance, 'dialog_warning', TPortableNetworkGraphic); end; mtError: begin Caption:= rsMtError; - image1.Picture.LoadFromLazarusResource('dialog_error'); + image1.Picture.LoadFromResourceName(hInstance, 'dialog_error', TPortableNetworkGraphic); end; mtConfirmation: begin Caption:= rsMtConfirmation; - image1.Picture.LoadFromLazarusResource('dialog_confirmation'); + image1.Picture.LoadFromResourceName(hInstance, 'dialog_confirmation', TPortableNetworkGraphic); end; mtInformation: begin Caption:= rsMtInformation; - image1.Picture.LoadFromLazarusResource('dialog_information'); + image1.Picture.LoadFromResourceName(hInstance, 'dialog_information', TPortableNetworkGraphic); end; mtCustom: begin Caption:= ApplicationName;