diff --git a/components/spktoolbar/designtime/SpkToolbar.lrs b/components/spktoolbar/designtime/SpkToolbar.lrs deleted file mode 100644 index b53ef54c8..000000000 --- a/components/spktoolbar/designtime/SpkToolbar.lrs +++ /dev/null @@ -1,64 +0,0 @@ -LazarusResources.Add('tspktoolbar','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#24#0#0#0#24#8#6#0#0#0#224'w='#248#0 - +#0#0#4'sBIT'#8#8#8#8'|'#8'd'#136#0#0#0#9'pHYs'#0#0#14#196#0#0#14#196#1#149'+' - +#14#27#0#0#0#25'tEXtSoftware'#0'www.inkscape.org'#155#238'<'#26#0#0#1#24'IDA' - +'TH'#137'c`'#24#234#128#209'$n'#222#127'ZZ'#192'DK'#195#25#24#24#24'X`'#140 - +#221#19#3'q*r'#205'_O'#185#5#12#12#12#12#187'w'#239'f'#216#179'g'#15#156#239 - +#226#226#194#224#234#234#202#192#192#192#192#16#239#165#197#16#239#165#5#151 - +'['#184#237#26'\'#28#159#24'<'#14'h'#229#3#198#247#239#223#15#147'H~='#207#3 - +'EB4i'#7'V'#13#130'iO'#25#174#212#163#138#233'420'#188#159'%'#13#231#27'UtbZ' - +#192#192#192#192#160#154'9'#143#129#129#129#129#225#246#244'$'#20#11#209'-' - +#19#16#16'`````'#144')'#252#192#240#164'_'#128#129#129#225#3#134'C'#238#205 - +'h'#199#180#128#225#203'a'#136'E'#177#137'p'#161#219#139#231'ch'#150')'#252 - +#128#149#141#13#160'X'#128#205'0l'#224#255'*m'#20'>c'#216'U'#226',P'#245#229 - +#197'Pp{'#243'g'#162',%'#202#2'b'#13#195#231'b'#24'P'#202#168#132#168#29'>' - +#249#224#196#137#19#12'''O'#158#196'P`nn'#206'`aa'#193#128'O'#29'>5C?'#136'h' - +#31#7'G'#142#28#161#181#29'C'#28#0#0#231'9`m'#19#220#140'*'#0#0#0#0'IEND'#174 - +'B`'#130 -]); -LazarusResources.Add('tspktoolbar_150','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0'$'#0#0#0'$'#8#6#0#0#0#225#0#152#152 - +#0#0#0#4'sBIT'#8#8#8#8'|'#8'd'#136#0#0#0#9'pHYs'#0#0#14#196#0#0#14#196#1#149 - +'+'#14#27#0#0#0#25'tEXtSoftware'#0'www.inkscape.org'#155#238'<'#26#0#0#1#164 - +'IDATX'#133#237#149'1K'#195'@'#24#134#223'+'#29#164#25#171'.nB'#23#187'I'#233 - +'?('#168#224#224'"'#184'(H'#135#130'C6Q'#4'QA'#164'c'#22#17')'#1'''q'#18#29 - +'DL'#199'nE'#208#193'.'#7'n"'#146'!K-N'#137#131#166'$'#185#203']L'#149#166 - +#146'g'#202'}w'#239#229'!'#249'r'#1'RF'#12'RZ'#213#157'aKx'#201#12'[ H'#226 - +#132#178#222#129#161'-E'#14'V'#212#203'_'#151#1#2'B.'#134'a'#132#139'T*'#190 - +#241#218#194#12#179#230#145#154'x'#160#230#143#231'B'#133#154#205#230'@Bg7' - +#157#208#155#138#230#128#192'W'#150#132'W'#150#184#166'&'#150'e'#165#231#144 - +#8'nS'#199#193#145'R'#240#175#248#15'B'#4'@'#158#169#138#250'd'#128#30'r@'#239#198#163#167 - +#191'q'#15'?Q'#159#132#157#212#211#181'm'#255#186#244#231'*!qBLSk'#154'&'#13 - +#169#170#202#173#139#178'Q3'#140'P'#185'\'#150#10#133#17''''#27#204#164'M-#q' - +'B'#217'V'#171'5l'#135#148#209#230#19'a'#210#137'u>'#239''''#251#0#0#0#0'IEN' - +'D'#174'B`'#130 -]); -LazarusResources.Add('tspktoolbar_200','PNG',[ - #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0'0'#0#0#0'0'#8#6#0#0#0'W'#2#249#135 - +#0#0#0#4'sBIT'#8#8#8#8'|'#8'd'#136#0#0#0#9'pHYs'#0#0#14#196#0#0#14#196#1#149 - +'+'#14#27#0#0#0#25'tEXtSoftware'#0'www.inkscape.org'#155#238'<'#26#0#0#1#133 - +'IDATh'#129'c`'#24#5#163'`d'#3'F'#147#184'y'#255#7#218#17#148#0#166#129'v'#0 - +#165'`'#212#3#3#13'X'#208#5'vO'#12'$'#203' '#215#252#245#20';'#134#28'0'#252 - +'b'#0#25#148#151#151#227#213#220#217#217#137'U|'#223#148#16#188#250#156'r' - +#214'PM'#221#144#143#1#140'z`4'#15#208#25'0'#190#127#255'~'#180'&'#30'H0'#234 - +#129#129#6#24#245#192#235'y'#30'x5'#136'&'#237' '#201#2#193#180#167#12#12#12 - +#12#12#23#170#255#224'Ug'#208#10'q'#202#251'Y'#210'X'#229#141'*'#176#215'9x+' - +'2j'#2#14#14#14#20#190'F-'#196'C7'#154'aN'#192#239'A\'#0#167#7'T3'#231#161 - +#240'oOOb``'#192#29'C'#132'b'#6#221#3#12#12'_'#208#196#191#224#213#15#3#247 - +'f'#180#163#240'q'#199#192#223#143'D'#25'H,@'#247#192#139#201#216'=D*'#192 - +#237#129'_'#15'Q'#184#170#9#5'X'#149#221'^0'#129'('#139'$r'#223#16#239'*'#18 - +#0#30#15'<'#162#137#133#212#6'8=p{'#217':'#170'Z'#244#127#149'6^y'#198#176 - +#171'd'#153';'#252#234#1#24'P'#141#240'!'#202#128#219'+'#182'P'#205'1'#228#0 - +#220'y'#224#205'T"'#141#144#167#142'K'#200#4#184#243#192#30#234':'#140#220'4' - +#142#14#148'2*Q'#248'C>'#15#140#246#7#6#26#140'z`'#160#1#214'Rh'#226#196#137 - +'$'#25#146#159#159#143'W'#158'X'#243#200'1g'#200#199#192'h)4'#208'`'#212#3#3 - +#13'F=0'#208#128#229#200#145'#'#3#237#6#138#192#144#143#129'Q0'#10'F:'#0#0 - +#196'm]'#132'E[)'#137#0#0#0#0'IEND'#174'B`'#130 -]); diff --git a/components/spktoolbar/designtime/SpkToolbar.res b/components/spktoolbar/designtime/SpkToolbar.res new file mode 100644 index 000000000..6616d4124 Binary files /dev/null and b/components/spktoolbar/designtime/SpkToolbar.res differ diff --git a/components/spktoolbar/designtime/icons/TSpkPopupMenu.png b/components/spktoolbar/designtime/icons/TSpkPopupMenu.png new file mode 100644 index 000000000..5b74e1992 Binary files /dev/null and b/components/spktoolbar/designtime/icons/TSpkPopupMenu.png differ diff --git a/components/spktoolbar/designtime/icons/TSpkPopupMenu_150.png b/components/spktoolbar/designtime/icons/TSpkPopupMenu_150.png new file mode 100644 index 000000000..83fd5a867 Binary files /dev/null and b/components/spktoolbar/designtime/icons/TSpkPopupMenu_150.png differ diff --git a/components/spktoolbar/designtime/icons/TSpkPopupMenu_200.png b/components/spktoolbar/designtime/icons/TSpkPopupMenu_200.png new file mode 100644 index 000000000..6426ebabb Binary files /dev/null and b/components/spktoolbar/designtime/icons/TSpkPopupMenu_200.png differ diff --git a/components/spktoolbar/designtime/icons/make_res.bat b/components/spktoolbar/designtime/icons/make_res.bat index 379023c42..d5e8587da 100644 --- a/components/spktoolbar/designtime/icons/make_res.bat +++ b/components/spktoolbar/designtime/icons/make_res.bat @@ -1 +1,3 @@ -lazres ..\SpkToolbar.lrs tspktoolbar.png tspktoolbar_150.png tspktoolbar_200.png \ No newline at end of file +dir /b *.png > files.txt +lazres ..\SpkToolbar.res @files.txt +del files.txt diff --git a/components/spktoolbar/designtime/icons/tspktoolbar.png b/components/spktoolbar/designtime/icons/tspktoolbar.png index 88c423c89..61966b9e5 100644 Binary files a/components/spktoolbar/designtime/icons/tspktoolbar.png and b/components/spktoolbar/designtime/icons/tspktoolbar.png differ diff --git a/components/spktoolbar/designtime/icons/tspktoolbar_150.png b/components/spktoolbar/designtime/icons/tspktoolbar_150.png index 4399bf8a9..98fd7f3ae 100644 Binary files a/components/spktoolbar/designtime/icons/tspktoolbar_150.png and b/components/spktoolbar/designtime/icons/tspktoolbar_150.png differ diff --git a/components/spktoolbar/designtime/icons/tspktoolbar_200.png b/components/spktoolbar/designtime/icons/tspktoolbar_200.png index 0f1a1a447..76c78702e 100644 Binary files a/components/spktoolbar/designtime/icons/tspktoolbar_200.png and b/components/spktoolbar/designtime/icons/tspktoolbar_200.png differ diff --git a/components/spktoolbar/registerspktoolbar.pas b/components/spktoolbar/registerspktoolbar.pas index 9dea84e3f..c50a51732 100644 --- a/components/spktoolbar/registerspktoolbar.pas +++ b/components/spktoolbar/registerspktoolbar.pas @@ -5,17 +5,18 @@ unit RegisterSpkToolbar; interface uses - Classes, SysUtils, LazarusPackageIntf, SpkToolbar, PropEdits, ComponentEditors, - SpkToolbarEditor, SpkPopup, spkt_Buttons, spkt_Checkboxes, spkt_Pane, spkt_Tab, - spkt_Appearance, - LResources; + Classes, SysUtils, PropEdits, ComponentEditors, LazarusPackageIntf; procedure Register; implementation +{$R designtime/spktoolbar.res} + uses - ImgList; + ImgList, LResources, + SpkToolbar, SpkToolbarEditor, SpkPopup, spkt_Buttons, spkt_Checkboxes, + spkt_Pane, spkt_Tab, spkt_Appearance; procedure RegisterUnitSpkToolbar; begin @@ -42,6 +43,14 @@ begin RegisterNoIcon([TSpkTab]); end; +procedure SkipObsoleteProperties; +const + GROUPBEHAVIOUR_NOTE = 'GroupBehaviour is not needed.'; +begin + RegisterPropertyToSkip(TSpkCheckbox, 'Groupbehaviour', GROUPBEHAVIOUR_NOTE, ''); + RegisterPropertyToSkip(TSpkRadioButton, 'GroupBehaviour', GROUPBEHAVIOUR_NOTE, ''); +end; + procedure Register; begin RegisterUnit('SpkToolbar', @RegisterUnitSpkToolbar); @@ -57,22 +66,11 @@ begin TSpkImageIndexPropertyEditor); RegisterPropertyEditor(TypeInfo(TImageIndex), TSpkSmallButton, '', TSpkImageIndexPropertyEditor); + //todo: register Caption Editor -end; - -procedure SkipObsoleteProperties; -const - GROUPBEHAVIOUR_NOTE = 'GroupBehaviour is not needed.'; -begin - RegisterPropertyToSkip(TSpkCheckbox, 'Groupbehaviour', GROUPBEHAVIOUR_NOTE, ''); - RegisterPropertyToSkip(TSpkRadioButton, 'GroupBehaviour', GROUPBEHAVIOUR_NOTE, ''); -end; - - -initialization -{$I SpkToolbar.lrs} SkipObsoleteProperties; +end; end. diff --git a/components/spktoolbar/spktoolbarpackage.lpk b/components/spktoolbar/spktoolbarpackage.lpk index 474bfccd9..fb02b1062 100644 --- a/components/spktoolbar/spktoolbarpackage.lpk +++ b/components/spktoolbar/spktoolbarpackage.lpk @@ -17,7 +17,7 @@ - + @@ -100,33 +100,21 @@ - - - - - - - - - - + + - - + + - - - - - - + + - +