diff --git a/.gitattributes b/.gitattributes index e4efc8d6c5..a5d2e977b7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4490,12 +4490,12 @@ examples/gridexamples/grid_semaphor/example/table04hidden.stb -text svneol=unset examples/gridexamples/grid_semaphor/example/unit1.lfm svneol=native#text/plain examples/gridexamples/grid_semaphor/example/unit1.pas svneol=native#text/pascal examples/gridexamples/grid_semaphor/readme.txt svneol=native#text/plain -examples/gridexamples/grid_semaphor/semaphordbgridicon.lrs svneol=native#text/pascal +examples/gridexamples/grid_semaphor/semaphordbgridicon.res -text examples/gridexamples/grid_semaphor/semaphordbgrids.pas svneol=native#text/pascal examples/gridexamples/grid_semaphor/semaphorgridlpk.lpk svneol=native#text/pascal examples/gridexamples/grid_semaphor/semaphorgridlpk.pas svneol=native#text/pascal examples/gridexamples/grid_semaphor/semaphorgrids.pas svneol=native#text/pascal -examples/gridexamples/grid_semaphor/semaphorgridsicon.lrs svneol=native#text/pascal +examples/gridexamples/grid_semaphor/semaphorgridsicon.res -text examples/gridexamples/grid_semaphor/tsemaphorgrid.xpm -text svneol=native#image/x-xpixmap examples/gridexamples/gridcelleditor/gridcelleditor.lpi svneol=native#text/plain examples/gridexamples/gridcelleditor/gridcelleditor.lpr svneol=native#text/plain diff --git a/examples/gridexamples/grid_semaphor/semaphordbgridicon.lrs b/examples/gridexamples/grid_semaphor/semaphordbgridicon.lrs deleted file mode 100644 index d7de6eae67..0000000000 --- a/examples/gridexamples/grid_semaphor/semaphordbgridicon.lrs +++ /dev/null @@ -1,15 +0,0 @@ -LazarusResources.Add('TSemaphorDBGrid','XPM',[ - '/* XPM */'#13#10'static char * TSemaphorDBGrid_xpm[] = {'#13#10'"21 21 9 1",' - +#13#10'" '#9'c None",'#13#10'".'#9'c #040404",'#13#10'"+'#9'c #048404",'#13 - +#10'"@'#9'c #7A7A7A",'#13#10'"#'#9'c #BABABA",'#13#10'"$'#9'c #FA0404",'#13 - +#10'"%'#9'c #FA04FA",'#13#10'"&'#9'c #FAFA04",'#13#10'"*'#9'c #FAFAFA",'#13 - +#10'"@@@@@@@@@@@@@@@ ",'#13#10'"@#@*####*#####@ ",'#13#10'"@@@@@@@' - +'@@@@@@@@ ",'#13#10'"@#@****#******@ $$ ",'#13#10'"@*@*$$*#*++++*@ $$' - +'$$ ",'#13#10'"@#@****#******@ $$$$ ",'#13#10'"@*@*&&*#*###**@ $$ ",'#13#10 - +'"@#@****#******@ ",'#13#10'"@*@..............&&..",'#13#10'"@#@.#.*###' - +'##*###&&&&.",'#13#10'"@@@.............&&&&.",'#13#10'" .#.*****#*****&&*.' - +'",'#13#10'" .*.##############.",'#13#10'" .#.*****#*****++*.",'#13#10'"' - +' .*.##########++++.",'#13#10'" .#.*****#****++++.",'#13#10'" .*.#####' - +'######++#.",'#13#10'" .#.*****#********.",'#13#10'" .*.##############."' - +','#13#10'" .#.*****#********.",'#13#10'" .................."};'#13#10 -]); diff --git a/examples/gridexamples/grid_semaphor/semaphordbgridicon.res b/examples/gridexamples/grid_semaphor/semaphordbgridicon.res new file mode 100644 index 0000000000..247765d9aa Binary files /dev/null and b/examples/gridexamples/grid_semaphor/semaphordbgridicon.res differ diff --git a/examples/gridexamples/grid_semaphor/semaphordbgrids.pas b/examples/gridexamples/grid_semaphor/semaphordbgrids.pas index e0d9d27718..7a17297f29 100644 --- a/examples/gridexamples/grid_semaphor/semaphordbgrids.pas +++ b/examples/gridexamples/grid_semaphor/semaphordbgrids.pas @@ -67,6 +67,8 @@ procedure Register; implementation +{$R SemaphorDBGridIcon.res} + procedure TSemaphorDBGrid.SetSemaphorShape(Value : TSemaphorShape); begin FSemaphorShape:=Value; @@ -165,9 +167,6 @@ begin RegisterComponents('Data Controls',[TSemaphorDBGrid]); end; -initialization - {$I SemaphorDBGridIcon.lrs} - end. diff --git a/examples/gridexamples/grid_semaphor/semaphorgrids.pas b/examples/gridexamples/grid_semaphor/semaphorgrids.pas index 7780d49a0d..ff7eaf0d46 100644 --- a/examples/gridexamples/grid_semaphor/semaphorgrids.pas +++ b/examples/gridexamples/grid_semaphor/semaphorgrids.pas @@ -148,6 +148,8 @@ procedure Register; implementation +{$R SemaphorGridsicon.res} + procedure TSemaphorGrid.DrawCell(aCol,aRow: Integer; aRect: TRect; aState:TGridDrawState); const dr=4; var Rect:TRect; @@ -772,8 +774,5 @@ begin RegisterComponents('Additional',[TSemaphorGrid]); end; -initialization - {$I SemaphorGridsicon.lrs} - end. diff --git a/examples/gridexamples/grid_semaphor/semaphorgridsicon.lrs b/examples/gridexamples/grid_semaphor/semaphorgridsicon.lrs deleted file mode 100644 index 6535bf87da..0000000000 --- a/examples/gridexamples/grid_semaphor/semaphorgridsicon.lrs +++ /dev/null @@ -1,17 +0,0 @@ -LazarusResources.Add('TSemaphorGrid','XPM',[ - '/* XPM */'#13#10'static char * TSemaforoGrid_xpm[] = {'#13#10'"23 23 10 1",' - +#13#10'" '#9'c None",'#13#10'".'#9'c #000000",'#13#10'"+'#9'c #FF0000",'#13 - +#10'"@'#9'c #C0C0C0",'#13#10'"#'#9'c #FFFFFF",'#13#10'"$'#9'c #46A057",'#13 - +#10'"%'#9'c #FFFF00",'#13#10'"&'#9'c #008000",'#13#10'"*'#9'c #1D0101",'#13 - +#10'"='#9'c #0E0000",'#13#10'" ",'#13#10'" ...........' - +'..... ++ ",'#13#10'" .@.#@@@@#@@@@@@. ++++ ",'#13#10'" ................ +' - +'+++ ",'#13#10'" .@.####@#######. ++ ",'#13#10'" .#.#$$#@#%%%%%#. ",' - +#13#10'" .@.####@#######. %% ",'#13#10'" .#.#++#@#....##. %%%% ",'#13#10'"' - +' .@.####@#######. %%%% ",'#13#10'" .#.#%%#@#$$$$$#. %% ",'#13#10'" .@.###' - +'#@#######. ",'#13#10'" .#.#..#@#++++##. && ",'#13#10'" .@.####@#####' - +'##. &&&& ",'#13#10'" *=.............. &&&& ",'#13#10'" + &&' - +' ",'#13#10'" + ",'#13#10'" ++ +++ ++ ",'#13 - +#10'" + + + + + ",'#13#10'" +++ + + + ",'#13#10'" +' - +' + + + + ",'#13#10'" + + + + + + ",'#13#10'" +++ +++' - +' ++ ",'#13#10'" "};'#13#10 -]); diff --git a/examples/gridexamples/grid_semaphor/semaphorgridsicon.res b/examples/gridexamples/grid_semaphor/semaphorgridsicon.res new file mode 100644 index 0000000000..a02dc501b9 Binary files /dev/null and b/examples/gridexamples/grid_semaphor/semaphorgridsicon.res differ