From 1be6e84c556b1ee052a5e8395e8b8a572714cf45 Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 9 Jan 2005 14:11:03 +0000 Subject: [PATCH] registered andadded icon for TTIGrid git-svn-id: trunk@6522 - --- .gitattributes | 1 + components/rtticontrols/rttictrls.lrs | 57 ++++++++++ components/rtticontrols/rttigrids.pas | 2 +- components/rtticontrols/ttigrid.xpm | 148 ++++++++++++++++++++++++++ lcl/dbgrids.pas | 7 +- 5 files changed, 212 insertions(+), 3 deletions(-) create mode 100644 components/rtticontrols/ttigrid.xpm diff --git a/.gitattributes b/.gitattributes index e021749758..9e4df2297a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -178,6 +178,7 @@ components/rtticontrols/ttichecklistbox.xpm -text svneol=native#image/x-xpixmap components/rtticontrols/tticolorbutton.xpm -text svneol=native#image/x-xpixmap components/rtticontrols/tticombobox.xpm -text svneol=native#image/x-xpixmap components/rtticontrols/ttiedit.xpm -text svneol=native#image/x-xpixmap +components/rtticontrols/ttigrid.xpm -text svneol=native#image/x-xpixmap components/rtticontrols/ttigroupbox.xpm -text svneol=native#image/x-xpixmap components/rtticontrols/ttiimage.xpm -text svneol=native#image/x-xpixmap components/rtticontrols/ttilabel.xpm -text svneol=native#image/x-xpixmap diff --git a/components/rtticontrols/rttictrls.lrs b/components/rtticontrols/rttictrls.lrs index d2ccf33d9c..2d108bc10b 100644 --- a/components/rtticontrols/rttictrls.lrs +++ b/components/rtticontrols/rttictrls.lrs @@ -703,6 +703,63 @@ LazarusResources.Add('ttiedit','XPM',[ +' 3+4+5+6+7+8+9+0+a+b+c+d+e+ ",'#10'" f+g+h+i+ ' +'j+k+l+m+ "};'#10 ]); +LazarusResources.Add('ttigrid','XPM',[ + '/* XPM */'#10'static char * ttigrid_xpm[] = {'#10'"23 23 122 2",'#10'" '#9 + +'c None",'#10'". '#9'c #000000",'#10'"+ '#9'c #C0C0C0",'#10'"@ '#9'c #FFFFFF' + +'",'#10'"# '#9'c #909090",'#10'"$ '#9'c #000080",'#10'"% '#9'c #775E5A",'#10 + +'"& '#9'c #4F3732",'#10'"* '#9'c #E4C1BA",'#10'"= '#9'c #C3988E",'#10'"- '#9 + +'c #4B251C",'#10'"; '#9'c #CC8170",'#10'"> '#9'c #934737",'#10'", '#9'c #B84' + +'F39",'#10'"'' '#9'c #A03F2A",'#10'") '#9'c #3C160E",'#10'"! '#9'c #6E291A",' + +#10'"~ '#9'c #B4452D",'#10'"{ '#9'c #B4452E",'#10'"] '#9'c #9A3A25",'#10'"^ ' + +#9'c #31120C",'#10'"/ '#9'c #441910",'#10'"( '#9'c #AC4C37",'#10'"_ '#9'c #C' + +'06450",'#10'": '#9'c #C16552",'#10'"< '#9'c #BD5F4C",'#10'"[ '#9'c #7B2F1F"' + +','#10'"} '#9'c #0F0503",'#10'"| '#9'c #51271E",'#10'"1 '#9'c #A56D61",'#10 + +'"2 '#9'c #C3877A",'#10'"3 '#9'c #B97F73",'#10'"4 '#9'c #865044",'#10'"5 '#9 + +'c #170A06",'#10'"6 '#9'c #25282C",'#10'"7 '#9'c #5F6267",'#10'"8 '#9'c #434' + +'54A",'#10'"9 '#9'c #362F23",'#10'"0 '#9'c #766A5A",'#10'"a '#9'c #5B5143",' + +#10'"b '#9'c #17130C",'#10'"c '#9'c #53585F",'#10'"d '#9'c #C9CBD0",'#10'"e ' + +#9'c #CED0D5",'#10'"f '#9'c #C9CBD1",'#10'"g '#9'c #898D93",'#10'"h '#9'c #1' + +'D2025",'#10'"i '#9'c #51644D",'#10'"j '#9'c #C5D2C2",'#10'"k '#9'c #D2DECF"' + +','#10'"l '#9'c #CCDAC9",'#10'"m '#9'c #96A891",'#10'"n '#9'c #1E291B",'#10 + +'"o '#9'c #2A2F39",'#10'"p '#9'c #888D97",'#10'"q '#9'c #EFF0F1",'#10'"r '#9 + +'c #B0B3BB",'#10'"s '#9'c #9499A3",'#10'"t '#9'c #8E939D",'#10'"u '#9'c #414' + +'650",'#10'"v '#9'c #202F1F",'#10'"w '#9'c #8DA987",'#10'"x '#9'c #E8EFE7",' + +#10'"y '#9'c #BBCEB7",'#10'"z '#9'c #9CB796",'#10'"A '#9'c #9BB795",'#10'"B ' + +#9'c #4A6844",'#10'"C '#9'c #2A303B",'#10'"D '#9'c #575F6F",'#10'"E '#9'c #A' + +'6AAB3",'#10'"F '#9'c #686F7D",'#10'"G '#9'c #525A6B",'#10'"H '#9'c #51596A"' + +','#10'"I '#9'c #404858",'#10'"J '#9'c #375335",'#10'"K '#9'c #658F5B",'#10 + +'"L '#9'c #A6BFA1",'#10'"M '#9'c #779C6E",'#10'"N '#9'c #5F8B55",'#10'"O '#9 + +'c #4B7441",'#10'"P '#9'c #1A2A17",'#10'"Q '#9'c #282E39",'#10'"R '#9'c #434' + +'C5E",'#10'"S '#9'c #3C4455",'#10'"T '#9'c #365334",'#10'"U '#9'c #518146",' + +#10'"V '#9'c #47713D",'#10'"W '#9'c #192816",'#10'"X '#9'c #1F242D",'#10'"Y ' + +#9'c #48505F",'#10'"Z '#9'c #5D6474",'#10'"` '#9'c #5D6574",'#10'" .'#9'c #5' + +'75F6E",'#10'"..'#9'c #2D333F",'#10'"+.'#9'c #1C2B1A",'#10'"@.'#9'c #55804B"' + +','#10'"#.'#9'c #68915E",'#10'"$.'#9'c #699260",'#10'"%.'#9'c #648E5B",'#10 + +'"&.'#9'c #395C32",'#10'"*.'#9'c #090E07",'#10'"=.'#9'c #353A43",'#10'"-.'#9 + +'c #868C97",'#10'";.'#9'c #9398A2",'#10'">.'#9'c #90959F",'#10'",.'#9'c #5E6' + +'36E",'#10'"''.'#9'c #111419",'#10'").'#9'c #070B06",'#10'"!.'#9'c #395033",' + +#10'"~.'#9'c #89A783",'#10'"{.'#9'c #9BB695",'#10'"].'#9'c #98B491",'#10'"^.' + +#9'c #6B8964",'#10'"/.'#9'c #162414",'#10'"(.'#9'c #17191E",'#10'"_.'#9'c #3' + +'1343B",'#10'":.'#9'c #23262C",'#10'"<.'#9'c #070709",'#10'"[.'#9'c #192517"' + +','#10'"}.'#9'c #364831",'#10'"|.'#9'c #293826",'#10'"1.'#9'c #090E08",'#10 + +'". . . . . . . . . . . . . . . . . . ",'#10'". + . @ + + + + + @ ' + +'+ + + + + + + . # ",'#10'". . . . . . . . . . . . . . . . . . # ' + +' ",'#10'". + . @ @ @ @ @ + @ @ @ @ @ @ @ @ . # ",'#10'". @ . @ ' + +'$ $ $ @ + @ $ $ $ $ $ $ @ . # ",'#10'". + . @ @ @ @ @ + @ @ @ @ @ @' + +' @ @ . # ",'#10'". @ . @ $ $ $ @ + @ $ $ $ $ $ @ @ . # ",' + +#10'". + . @ @ @ @ @ + @ @ @ @ @ @ @ @ . # ",'#10'". @ . @ $ $ $ @ +' + +' @ $ $ $ $ $ $ @ . # % & ",'#10'". + . @ @ @ @ @ + @ @ @ @ @ @ @ @ . # ' + +'* = - ",'#10'". . . . . . . . . . . . . . . . . . # ; ; > ",'#10'" # #' + +' # # # # # # # # # # # # # # # # , , '' ) ",'#10'" ' + +' ! ~ { { { ~ ] ^ ",'#10'" / ( _ : : < [ } ' + +'",'#10'" | 1 2 3 4 5 ",'#10'" ' + +' 6 7 8 9 0 a b ",'#10'" c d e f g h i ' + +'j k l m n ",'#10'" o p q r s t u v w x y z A B ",'#10'" ' + +' C D E F G H I J K L M N N O P ",'#10'" Q R R ' + +'R R R S T U U U U U V W ",'#10'" X Y Z ` ` ...+.@.#.$.$.%.&' + +'.*.",'#10'" =.-.;.>.,.''.).!.~.{.].^./. ",'#10'" ' + +' (._.:.<. [.}.|.1. "};'#10 +]); LazarusResources.Add('ttigroupbox','XPM',[ '/* XPM */'#10'static char * ttigroupbox_xpm[] = {'#10'"23 23 115 2",'#10'" ' +#9'c None",'#10'". '#9'c #AE0013",'#10'"+ '#9'c #808080",'#10'"@ '#9'c #C0C0' diff --git a/components/rtticontrols/rttigrids.pas b/components/rtticontrols/rttigrids.pas index 3d1a86ed01..78ce066978 100644 --- a/components/rtticontrols/rttigrids.pas +++ b/components/rtticontrols/rttigrids.pas @@ -230,7 +230,7 @@ implementation procedure Register; begin - RegisterComponents('RTTI',[TTIPropertyGrid]); + RegisterComponents('RTTI',[TTIPropertyGrid,TTIGrid]); end; { TTICustomStringGrid } diff --git a/components/rtticontrols/ttigrid.xpm b/components/rtticontrols/ttigrid.xpm new file mode 100644 index 0000000000..8c99f6b790 --- /dev/null +++ b/components/rtticontrols/ttigrid.xpm @@ -0,0 +1,148 @@ +/* XPM */ +static char * ttigrid_xpm[] = { +"23 23 122 2", +" c None", +". c #000000", +"+ c #C0C0C0", +"@ c #FFFFFF", +"# c #909090", +"$ c #000080", +"% c #775E5A", +"& c #4F3732", +"* c #E4C1BA", +"= c #C3988E", +"- c #4B251C", +"; c #CC8170", +"> c #934737", +", c #B84F39", +"' c #A03F2A", +") c #3C160E", +"! c #6E291A", +"~ c #B4452D", +"{ c #B4452E", +"] c #9A3A25", +"^ c #31120C", +"/ c #441910", +"( c #AC4C37", +"_ c #C06450", +": c #C16552", +"< c #BD5F4C", +"[ c #7B2F1F", +"} c #0F0503", +"| c #51271E", +"1 c #A56D61", +"2 c #C3877A", +"3 c #B97F73", +"4 c #865044", +"5 c #170A06", +"6 c #25282C", +"7 c #5F6267", +"8 c #43454A", +"9 c #362F23", +"0 c #766A5A", +"a c #5B5143", +"b c #17130C", +"c c #53585F", +"d c #C9CBD0", +"e c #CED0D5", +"f c #C9CBD1", +"g c #898D93", +"h c #1D2025", +"i c #51644D", +"j c #C5D2C2", +"k c #D2DECF", +"l c #CCDAC9", +"m c #96A891", +"n c #1E291B", +"o c #2A2F39", +"p c #888D97", +"q c #EFF0F1", +"r c #B0B3BB", +"s c #9499A3", +"t c #8E939D", +"u c #414650", +"v c #202F1F", +"w c #8DA987", +"x c #E8EFE7", +"y c #BBCEB7", +"z c #9CB796", +"A c #9BB795", +"B c #4A6844", +"C c #2A303B", +"D c #575F6F", +"E c #A6AAB3", +"F c #686F7D", +"G c #525A6B", +"H c #51596A", +"I c #404858", +"J c #375335", +"K c #658F5B", +"L c #A6BFA1", +"M c #779C6E", +"N c #5F8B55", +"O c #4B7441", +"P c #1A2A17", +"Q c #282E39", +"R c #434C5E", +"S c #3C4455", +"T c #365334", +"U c #518146", +"V c #47713D", +"W c #192816", +"X c #1F242D", +"Y c #48505F", +"Z c #5D6474", +"` c #5D6574", +" . c #575F6E", +".. c #2D333F", +"+. c #1C2B1A", +"@. c #55804B", +"#. c #68915E", +"$. c #699260", +"%. c #648E5B", +"&. c #395C32", +"*. c #090E07", +"=. c #353A43", +"-. c #868C97", +";. c #9398A2", +">. c #90959F", +",. c #5E636E", +"'. c #111419", +"). c #070B06", +"!. c #395033", +"~. c #89A783", +"{. c #9BB695", +"]. c #98B491", +"^. c #6B8964", +"/. c #162414", +"(. c #17191E", +"_. c #31343B", +":. c #23262C", +"<. c #070709", +"[. c #192517", +"}. c #364831", +"|. c #293826", +"1. c #090E08", +". . . . . . . . . . . . . . . . . . ", +". + . @ + + + + + @ + + + + + + + . # ", +". . . . . . . . . . . . . . . . . . # ", +". + . @ @ @ @ @ + @ @ @ @ @ @ @ @ . # ", +". @ . @ $ $ $ @ + @ $ $ $ $ $ $ @ . # ", +". + . @ @ @ @ @ + @ @ @ @ @ @ @ @ . # ", +". @ . @ $ $ $ @ + @ $ $ $ $ $ @ @ . # ", +". + . @ @ @ @ @ + @ @ @ @ @ @ @ @ . # ", +". @ . @ $ $ $ @ + @ $ $ $ $ $ $ @ . # % & ", +". + . @ @ @ @ @ + @ @ @ @ @ @ @ @ . # * = - ", +". . . . . . . . . . . . . . . . . . # ; ; > ", +" # # # # # # # # # # # # # # # # # # , , ' ) ", +" ! ~ { { { ~ ] ^ ", +" / ( _ : : < [ } ", +" | 1 2 3 4 5 ", +" 6 7 8 9 0 a b ", +" c d e f g h i j k l m n ", +" o p q r s t u v w x y z A B ", +" C D E F G H I J K L M N N O P ", +" Q R R R R R S T U U U U U V W ", +" X Y Z ` ` ...+.@.#.$.$.%.&.*.", +" =.-.;.>.,.'.).!.~.{.].^./. ", +" (._.:.<. [.}.|.1. "}; diff --git a/lcl/dbgrids.pas b/lcl/dbgrids.pas index c60dfbf7fa..f32030b3ae 100644 --- a/lcl/dbgrids.pas +++ b/lcl/dbgrids.pas @@ -234,7 +234,7 @@ type procedure DrawCell(aCol,aRow: Integer; aRect: TRect; aState:TGridDrawState); override; procedure EditingColumn(aCol: Integer; Ok: boolean); procedure EditorCancelEditing; - procedure EditordoGetValue; override; + procedure EditorDoGetValue; override; function EditorCanAcceptKey(const ch: Char): boolean; override; function EditorIsReadOnly: boolean; override; procedure EndLayout; @@ -1296,7 +1296,7 @@ begin end; end; -procedure TCustomDbGrid.EditordoGetValue; +procedure TCustomDbGrid.EditorDoGetValue; begin inherited EditordoGetValue; UpdateData; @@ -1958,6 +1958,9 @@ end. { $Log$ + Revision 1.28 2005/01/09 14:11:03 mattias + registered andadded icon for TTIGrid + Revision 1.27 2005/01/08 15:06:06 mattias fixed TabOrder dialog for new TabOrder