You've already forked lazarus-ccr
spktoolbar: Fix compilation with current fpc trunk. Replace palette icon by a new version by Roland Hahn.
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6126 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
@ -319,10 +319,12 @@ type
|
||||
{$IF lcl_fullversion >= 1080000}
|
||||
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
|
||||
const AXProportion, AYProportion: Double); override;
|
||||
|
||||
procedure FixDesignFontsPPI(const ADesignTimePPI: Integer); override;
|
||||
|
||||
{$IF lcl_fullversion < 1080100}
|
||||
procedure FixDesignFontsPPI(const ADesignTimePPI: Integer);
|
||||
procedure ScaleFontsPPI(const AProportion: Double); override;
|
||||
{$ELSE}
|
||||
procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
|
||||
{$ENDIF}
|
||||
{$ENDIF}
|
||||
|
||||
public
|
||||
@ -1880,6 +1882,7 @@ begin
|
||||
ToolbarCornerRadius := round(ToolbarCornerRadius * AXProportion);
|
||||
end;
|
||||
|
||||
{$IF lcl_fullversion < 1080100}
|
||||
procedure TSpkToolbar.FixDesignFontsPPI(const ADesignTimePPI: Integer);
|
||||
begin
|
||||
inherited;
|
||||
@ -1895,7 +1898,16 @@ begin
|
||||
DoScaleFontPPI(FAppearance.Pane.CaptionFont, AProportion);
|
||||
DoScaleFontPPI(FAppearance.Element.CaptionFont, AProportion);
|
||||
end;
|
||||
|
||||
{$ELSE}
|
||||
procedure TSpkToolbar.ScaleFontsPPI(const AToPPI: Integer;
|
||||
const AProportion: Double);
|
||||
begin
|
||||
inherited;
|
||||
DoScaleFontPPI(FAppearance.Tab.TabHeaderFont, AToPPI, AProportion);
|
||||
DoScaleFontPPI(FAppearance.Pane.CaptionFont, AToPPI, AProportion);
|
||||
DoScaleFontPPI(FAppearance.Element.CaptionFont, AToPPI, AProportion);
|
||||
end;
|
||||
{$ENDIF}
|
||||
{$ENDIF}
|
||||
|
||||
end.
|
||||
|
||||
@ -272,7 +272,7 @@ uses
|
||||
|
||||
procedure SpkInitLayoutConsts(FromDPI: Integer; ToDPI: Integer = 0);
|
||||
begin
|
||||
if not(DPI_AWARE) then
|
||||
if not DPI_AWARE then
|
||||
ToDPI := FromDPI;
|
||||
|
||||
{$IfDef Darwin}
|
||||
|
||||
@ -1,46 +1,64 @@
|
||||
LazarusResources.Add('TSpkToolbar','PNG',[
|
||||
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#9'pHYs'#0#0#11#19#0#0#11#19#1#0#154#156#24#0#0#3#219'IDATH'#199#181#149
|
||||
+'Kh\U'#24#199#127#231#190#239#220#206'L'#6#146'&'#230'Q'#139#212'$5bDj'#165#8
|
||||
+'nt'#227#3'|'#128#221#9#238#173#27'W'#226#162#130'T'#9#149'n$'#11'w'#214#130
|
||||
+'"'#136#129#174'E(n'#130#10'jj'#147#182'&'#26#161'M'#155#201'8'#175'Lf'#238
|
||||
+#157#251'8'#199#197'$3I3i'#210#133#223#238#156#239#241'?'#223#255'{'#28#177
|
||||
+'RX?9'#191#156#127'kf'#182't'#134#3#200#235#167'r'#211'{*'#21#168'mG'#203#212
|
||||
+#251#141'&'#246#216#204'l'#233#204'{oN'#208#227#25#247#13'~'#246#226#28'E'#14
|
||||
+#239#253#16'q'#207'9'#134'vD'#165' '#145#138'r'#161#194'b)b(cRmD'#164'R6G'#7
|
||||
+'2'#187#157#129#229#229#21'\'#207#163#176'Z'#161'o8G'#181'Xg'#244#209#193#29
|
||||
+#166'm'#128'D*'#146'D'#209'h'#132'X'#182#197#221#226#6#249#213#10'%e2'#212
|
||||
+#151'F'#235#2#176'^'#221#160'\'#174#179#209'TX5'#31')'#229'.'#155'6'#128#148
|
||||
+#138'D*'#250#6'{'#233#3' '#3'c'#131#155#217')'#18#181#27'`'#242#201#177'}kf'
|
||||
+#156#255#250#247'K'#0#186#6'A'#148#236#235#240#227#236'M'#30'D'#12#128#143
|
||||
+#222#158'$'#174#255'M}'#249#194'}'#141'?x'#241#13#156#254#231#15#28#252#236
|
||||
+#197#185#14'E'#245#229#11#28'{'#230#253#182'2'#140'%'#150#161#237'pX'#250'i'
|
||||
+#234#129#0'v'#212'`K'#174'\'#205'Q'#174#134#184#166#6'J!'#132'b)'#31#241#206
|
||||
+#171'a'#171#25#18'E3'#146#4#139'70n'#255#133#159#191#139#138#18#204#23'^'#193
|
||||
+'}h'#8#219#212#208'u'#177#19#160'Z'#15#219#23#183'J'#138#19#199's'#12#247'8'
|
||||
+#248'M0'#13#201#247'3+'#157'V'#23#130#248#223'5'#178#27'k'#232'G'#143#208#148
|
||||
+'1'#217#235#215'Y'#155#250#16#235#252'4'#194#242#0#168#249'a'#7#160#30#196'x'
|
||||
+'@y'#225'S'#132#248#24']'#23'8'#166'DJ'#133#31'J'#12#203#162#188'p'#14#128'j'
|
||||
+'#"'#254'u'#150'L'#237#14#13#175#143#148#16'D##'#196#151#191#163'|m'#142'x'
|
||||
+#242#233'M'#138#147#14#128'T'#157#30'lF'#9#223#254#6#131'n'#157'(Q\'#253'Gp'
|
||||
+#219'w;'#181#137'$'#229#245'&'#217#249'9'#226'X'#167#186'x'#131#244#137'g'
|
||||
+#169')'#240'+'#1'v'#212#154#133#173#152#198'V'#218#219#7'ND>~a'#131#151#159
|
||||
+#211#201#223#177'X'#168#216#228'2)'#138#181#26'B'#128#152'<'#201#234#229'/'
|
||||
+#24'x'#233'5'#140'GF'#137#252#128'5'#205'fd'#226#9#132#232'R'#228#173#187'\n'
|
||||
+#128'LA'#177'Z'#172'0'#144')'#241#199#188'F'#214#238#225#136#19#131#158#1'j'
|
||||
+#8'!'#176#15#15'P{'#247#28#133'K'#211#196#127#222'$86N'#255'g_b'#185#169#246
|
||||
+'c'#133#18#219'3h'#1'DI'#154#211#199#191'B{'#172'['#195#165#1#208#4'hB'#144
|
||||
+#30#127#156#244''''#159#239#178#218'Z)R'#208#157#162#185#159'-'#156#180'F'
|
||||
+#226'K'#148'.'#208#140#150'nb'#210'lwQ'#20#4#228#235#17'q# '#155#203#16#249
|
||||
+'>'#229'@'#242#212'h'#127#155#13#209#141'"'#0#199#241#8#209#232#233#21'X'#150
|
||||
+'@'#25#130#212'!'#13'e'#247#0#191#160#9'p'#29#19'/L'#8#29#19']%H'#211'd8m'
|
||||
+#177#173#253#219#172#24#219#225#140#220'8'#227#167#186#175#246#237#142#158
|
||||
+#231#224'y'#206'>3,vg '#140#204#190#163#175#9'q'#160#21'!'#186#213'`'#169#181
|
||||
+'X'#15#228#200#129#222#191#9#144'(Ech'#138'z'#173#140'n'#24#232#154#192#188
|
||||
+'g'#209#1#160'{'#16#238#29'4N$'#134#174#181#255#231'6'#128'R'#130'D8'#172#148
|
||||
+'L'#210#25#151'('#150'DA'#19#203'Ka!'#137'6?'#163'$'#168#17'h>'#135#204#214
|
||||
+'zI9&'#145'T'#200'0'#193'v-'#130'f'#200#216#195#189'[|'#239#158#131#254#190
|
||||
+#12'B@,!15l'#215'"j'#134#168'D'#161#27#2#215'5'#9#164#134'c'#130#235'Hb)1'#1
|
||||
+#219'sh'#198#9#134#225'p+_e'#164'?'#219#161#234#202#181#162#250#230#135'%'
|
||||
+#254'/'#249#15'Q'#18#144#245'C'#140#131#200#0#0#0#0'IEND'#174'B`'#130
|
||||
+#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'<gB'#162#237#227#17'r`'#234#243#204#130#137#245#219'H2'
|
||||
+#249#218#11#218#155#31'L'#221#21')'#213#199'`'#157'N'#249#230'g'#183#234'"!'
|
||||
+#0' (T'#15#250'#'#218#216#133#169#207'q%x'#162#185'\'#206'''S'#220#179#1#0
|
||||
+#157#253#12#0#155#187#207#243#201#145'H'#8#192'{'#187#127'YXY'#228'nB'#207
|
||||
+#175#185'u'#175#208#23']'#16#226#214#187#220'L'#16'V'#168#215#230','#147#227
|
||||
+'8'#128#162'('#190#154'y'#172#244#231'b'#11#209#171#215'XB'#0'0'#185#241#198
|
||||
+#173#203#26'^(T'#168#30'JC'#180#177#195#212#8#1#236#139'bh'#134',?'#197#19'B'
|
||||
+#239'>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
|
||||
]);
|
||||
|
||||
1
components/spktoolbar/designtime/icons/make_res.bat
Normal file
1
components/spktoolbar/designtime/icons/make_res.bat
Normal file
@ -0,0 +1 @@
|
||||
lazres ..\SpkToolbar.lrs tspktoolbar.png tspktoolbar_150.png tspktoolbar_200.png
|
||||
BIN
components/spktoolbar/designtime/icons/tspktoolbar.png
Normal file
BIN
components/spktoolbar/designtime/icons/tspktoolbar.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 411 B |
BIN
components/spktoolbar/designtime/icons/tspktoolbar_150.png
Normal file
BIN
components/spktoolbar/designtime/icons/tspktoolbar_150.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 551 B |
BIN
components/spktoolbar/designtime/icons/tspktoolbar_200.png
Normal file
BIN
components/spktoolbar/designtime/icons/tspktoolbar_200.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 520 B |
@ -16,7 +16,7 @@
|
||||
</CompilerOptions>
|
||||
<Description Value="Ribbon-like toolbar"/>
|
||||
<License Value="Modified LGPL (like Lazarus)"/>
|
||||
<Version Minor="1" Release="2"/>
|
||||
<Version Minor="1" Release="4"/>
|
||||
<Files Count="26">
|
||||
<Item1>
|
||||
<Filename Value="SpkToolbar\spkt_Appearance.pas"/>
|
||||
|
||||
Reference in New Issue
Block a user