From 0f753789faced757658e4d881d0196c137bb749b Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 30 Aug 2003 18:53:08 +0000 Subject: [PATCH] using default colors, when theme does not define them git-svn-id: trunk@4548 - --- ide/main.pp | 14 +- images/btn_openfile.xpm | 239 ++++++++-------- images/btn_save.xpm | 386 ++++++++++++++------------ images/laz_images.lrs | 217 ++++++++------- lcl/comctrls.pp | 5 +- lcl/include/statusbar.inc | 4 +- lcl/interfaces/gtk/gtkcallback.inc | 13 +- lcl/interfaces/gtk/gtkobject.inc | 9 +- lcl/interfaces/gtk/gtkproc.inc | 115 +++++--- lcl/interfaces/gtk/gtkproc.pp | 3 + lcl/interfaces/gtk/gtkwinapiwindow.pp | 5 + 11 files changed, 557 insertions(+), 453 deletions(-) diff --git a/ide/main.pp b/ide/main.pp index 9ed3ec41c1..68f0eee21c 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -1012,8 +1012,15 @@ end; procedure TMainIDE.MainIDEResize(Sender: TObject); begin - if ComponentNotebook<>nil then - ComponentNotebook.Width:=ClientWidth-ComponentNotebook.Left; + if ComponentNotebook<>nil then begin + with ComponentNotebook do + SetBounds(Left,0, + Parent.ClientWidth-ComponentNotebook.Left,Parent.CLientHeight); + end; + if pnlSpeedButtons<>nil then begin + with pnlSpeedButtons do + SetBounds(0,0,Width,Parent.ClientHeight); + end; end; {------------------------------------------------------------------------------} @@ -9748,6 +9755,9 @@ end. { ============================================================================= $Log$ + Revision 1.644 2003/08/30 18:53:07 mattias + using default colors, when theme does not define them + Revision 1.643 2003/08/22 18:10:39 mattias implemented selections in component tree diff --git a/images/btn_openfile.xpm b/images/btn_openfile.xpm index 51ca66fb6f..e01a59f8e3 100644 --- a/images/btn_openfile.xpm +++ b/images/btn_openfile.xpm @@ -1,127 +1,118 @@ /* XPM */ static char * btn_openfile_xpm[] = { -"16 13 111 2", +"18 18 97 2", " c None", -". c #020703", -"+ c #000100", -"@ c #000004", -"# c #000005", -"$ c #040507", -"% c #000000", -"& c #010200", -"* c #030400", -"= c #090900", -"- c #040400", -"; c #010100", -"> c #040300", -", c #EDF0B9", -"' c #FFFFBD", -") c #EBEDA4", -"! c #0A0B00", -"~ c #070600", -"{ c #060400", -"] c #141300", -"^ c #030200", -"/ c #060500", -"( c #FFFFB8", -"_ c #EEF58E", -": c #FCFF94", -"< c #E9EF85", -"[ c #FFFFB1", -"} c #E7E89C", -"| c #E1E3A4", -"1 c #FFFFD1", -"2 c #090A00", -"3 c #0D0B00", -"4 c #E7EA8F", -"5 c #FFFF98", -"6 c #F0F776", -"7 c #FFFF92", -"8 c #F0EE89", -"9 c #FFFFAF", -"0 c #F8FBA2", -"a c #FEFFAE", -"b c #EFF0AA", -"c c #060600", -"d c #070300", -"e c #FEFEA8", -"f c #F2F582", -"g c #FFFF8F", -"h c #F2F37C", -"i c #0E0900", -"j c #0D0800", -"k c #0A0900", -"l c #080A00", -"m c #0A0A00", -"n c #070500", -"o c #030000", -"p c #F6F4A7", -"q c #FFFF9D", -"r c #EFF07B", -"s c #111100", -"t c #7B7716", -"u c #89852A", -"v c #818121", -"w c #7F8022", -"x c #82822C", -"y c #7A7B2D", -"z c #7B7C3A", -"A c #84844E", -"B c #75764E", -"C c #0A0800", -"D c #FFFFC5", -"E c #E7EA91", -"F c #0E1100", -"G c #7E8211", -"H c #808310", -"I c #878B13", -"J c #7F8308", -"K c #83870E", -"L c #7B7F11", -"M c #818526", -"N c #797C2F", -"O c #7C7D43", -"P c #040500", -"Q c #E3E3AD", -"R c #7F842A", -"S c #767B15", -"T c #848B1B", -"U c #747903", -"V c #7D8108", -"W c #7F820F", -"X c #858821", -"Y c #797C23", -"Z c #7F823B", -"` c #0A0D00", -" . c #050300", -".. c #070800", -"+. c #7B7B45", -"@. c #737631", -"#. c #878A3B", -"$. c #7B7F28", -"%. c #82852A", -"&. c #7C7F28", -"*. c #858636", -"=. c #7B7B33", -"-. c #7A7A3E", -";. c #030100", -">. c #101000", -",. c #040600", -"'. c #040700", -"). c #060700", -"!. c #090800", -"~. c #0E0B00", -"{. c #070400", -" . + @ ", -" # $ % ", -" & + ", -" * = - ; = ; ", -"> , ' ) ! ~ { > ] ^ ^ ", -"/ ( _ : < [ } ' | 1 2 ", -"3 4 5 6 7 8 9 0 a b c ", -"d e f g h i j k l m m n { > ^ o ", -"d p q r s t u v w x y z A B c ", -"C D E F G H I J K L M N O P ", -"- Q ! R S T U V W X Y Z ` ", -" ...+.@.#.$.%.&.*.=.-./ ", -";.>.- ,.'...).!.n ~.{. "}; +". c #000000", +"+ c #4E331B", +"@ c #E5A566", +"# c #FED39A", +"$ c #FEC585", +"% c #FDC587", +"& c #FEC282", +"* c #F8AC62", +"= c #FEC88A", +"- c #53504D", +"; c #55524F", +"> c #5C5A57", +", c #54514E", +"' c #565350", +") c #C4864E", +"! c #524F4C", +"~ c #F5F5F5", +"{ c #ECECEC", +"] c #E4E4E4", +"^ c #DCDCDC", +"/ c #D4D4D4", +"( c #CBCBCB", +"_ c #C4C4C4", +": c #BCBCBC", +"< c #B5B5B5", +"[ c #B3B3B3", +"} c #303030", +"| c #4A3119", +"1 c #DBDBDB", +"2 c #DFDFDE", +"3 c #E8E8E7", +"4 c #E6E6E4", +"5 c #D2D2D1", +"6 c #C7C7C6", +"7 c #BABAB9", +"8 c #ADADAC", +"9 c #A0A09F", +"0 c #949493", +"a c #494948", +"b c #B77D44", +"c c #53514E", +"d c #DADADA", +"e c #DBDBDA", +"f c #E1E1E0", +"g c #DDDDDC", +"h c #D6D6D5", +"i c #CBCBCA", +"j c #C1C1C0", +"k c #B6B6B5", +"l c #A9A9A8", +"m c #686867", +"n c #222221", +"o c #493018", +"p c #CDCDCD", +"q c #CACAC9", +"r c #D5D5D4", +"s c #D2D2D0", +"t c #CCCCCB", +"u c #C2C2C1", +"v c #B9B9B8", +"w c #AFAFAE", +"x c #A2A2A1", +"y c #959594", +"z c #CECECE", +"A c #BEBEBC", +"B c #C4C4C2", +"C c #C6C6C5", +"D c #C3C3C2", +"E c #BFBFBE", +"F c #AEAEAD", +"G c #A5A5A4", +"H c #9E9E9D", +"I c #6F6F6E", +"J c #121212", +"K c #BDBDBD", +"L c #A6A6A5", +"M c #AAAAA8", +"N c #ADADAB", +"O c #AEAEAC", +"P c #ABABAA", +"Q c #A7A7A6", +"R c #A1A1A0", +"S c #9A9A99", +"T c #949492", +"U c #8D8D8B", +"V c #232323", +"W c #4A4A4A", +"X c #4A4A49", +"Y c #4C4C4B", +"Z c #4C4C4C", +"` c #4B4B4A", +" . c #464646", +".. c #434343", +"+. c #414140", +"@. c #343433", +"#. c #1F1F1E", +" . . . . ", +" . . . . . . . ", +" . . . . . ", +" . . . ", +" . . . . ", +" + + + + ", +"+ @ # $ @ + + + + + + + ", +"+ # % & * * * * * * * * . ", +"+ = & + - - ; > , , ' ' , . . . ", +"+ & ) ! ~ ~ { ] ^ / ( _ : < [ } ", +"+ & | 1 2 3 4 2 5 6 7 8 9 0 a ", +"+ b c d e f g h i j k l 9 m n ", +"+ o p q r r s t u v w x y a ", +"+ ' z A B C D E k F G H I J ", +"+ K L M N O P Q R S T U a ", +"V W X Y Z Y ` a ...+.@.#. ", +" ", +" "}; diff --git a/images/btn_save.xpm b/images/btn_save.xpm index f9b999a7d5..8cf45d9e36 100644 --- a/images/btn_save.xpm +++ b/images/btn_save.xpm @@ -1,186 +1,202 @@ /* XPM */ -static char *btn_save[]={ -"28 14 169 2", -"aD c None", -".e c #000000", -".a c #000002", -".b c #000005", -".d c #000007", -".c c #00000c", -"Qt c #000100", -".g c #000200", -".# c #000400", -".I c #000600", -".8 c #010000", -"aK c #01000c", -"az c #01000e", -"aj c #010100", -".w c #010200", -"#j c #010300", -".f c #010400", -"#J c #010500", -".U c #010600", -".6 c #010700", -"ah c #010a00", -".J c #020300", -"#8 c #020500", -".k c #020600", -"aG c #030000", -"aJ c #03000b", -"ap c #030010", -"aE c #030500", -".y c #030600", -"#6 c #030c00", -"ac c #040000", -"ad c #04000e", -".L c #040600", -"aB c #040900", -"#3 c #050000", -"ay c #05000e", -"aI c #050102", -"#4 c #050200", -"aL c #050209", -".h c #050704", -"#2 c #060000", -"ab c #060100", -"am c #060200", -"#E c #060600", -"#I c #060800", -"#Z c #070100", -"a# c #070300", -"aH c #070400", -"#C c #070500", -"#l c #070700", -"aM c #070800", -".X c #070900", -"ao c #080300", -"#i c #08050c", -"#z c #080700", -"au c #080901", -"#5 c #080b00", -"#F c #080e00", -"aa c #090300", -"#0 c #090400", -"#Y c #090700", -"ae c #0a0219", -"ax c #0a0500", -"#D c #0a0a00", -"aF c #0a0c00", -"#. c #0b0a00", -"#w c #0c0904", -".H c #0c1200", -"as c #0c1300", -"an c #0d0600", -"#1 c #0d0900", -"#A c #0e0c00", -"#u c #0f1400", -"#B c #141200", -".i c #585858", -"at c #666c3c", -"#v c #6d723a", -"#h c #6f744c", -".V c #707650", -"#G c #727d17", -"aw c #74783d", -"#7 c #747f33", -"#V c #74801e", -"aC c #757b57", -".9 c #767849", -"#T c #777d35", -"#M c #78782e", -".K c #787b4e", -".j c #787c5b", -"#x c #787e28", -"ak c #787f32", -"#P c #797744", -".W c #797b4c", -"#K c #79811e", -"#N c #7a7941", -".x c #7a7c54", -"#X c #7a8119", -"#O c #7b7a42", -"#R c #7b7a4c", -"#9 c #7b8127", -"#y c #7c801f", -"#W c #7c8323", -"#Q c #7e7b4e", -"al c #7e8235", -"av c #7f8348", -"#H c #7f8a2e", -"#U c #7f8b1f", -"#S c #80804e", -".u c #808080", -"#k c #808147", -".7 c #81865e", -"ai c #828a4f", -"a. c #83882c", -"#L c #8a9121", -"aA c #bebfb1", -".G c #bec0b2", -".o c #c0bebf", -".Y c #c1bca8", -".2 c #c3bdbd", -".v c #c3c3c3", -".s c #c3c4bc", -"#n c #c4bdab", -"#o c #c4bdad", -"#f c #c4bebe", -".P c #c4c1bc", -".E c #c4c2c7", -".0 c #c5c0bc", -".l c #c5c6b6", -".t c #c5c9b2", -"#c c #c6bdbe", -".D c #c6c4c7", -".z c #c6c5b0", -".n c #c6c5c1", -"aq c #c7c2c6", -".Q c #c7c3c4", -".N c #c7c4bb", -".B c #c7c4bd", -".p c #c7c4cd", -".S c #c7c6c2", -".F c #c7c6c4", -".A c #c7c7bd", -".5 c #c7c9b4", -"#a c #c8c0bd", -"#r c #c8c2b4", -".R c #c8c6c7", -".T c #c8c9b7", -"#d c #c9c0c3", -"#s c #c9c3b3", -".r c #c9c9cb", -"af c #cac6c7", -".m c #cac9c4", -"#t c #cacaa8", -"#g c #cbcab8", -"#e c #ccc6c8", -".O c #ccc7c1", -".3 c #ccc8c7", -".q c #ccc9d2", -"ag c #ccccb2", -".4 c #cdc9c6", -".Z c #cecac1", -"## c #cfc8b6", -"ar c #cfd1bc", -"#q c #d0cabc", -"#m c #d0cbab", -".C c #d0cfcb", -"#p c #d2ccbe", -".M c #d3d1ba", -"#b c #d5cccd", -".1 c #d6d1ce", -"Qt.#.#Qt.a.a.b.c.c.d.e.f.g.h.i.i.i.i.i.i.i.i.i.i.i.i.i.i", -".g.j.k.l.m.n.o.p.q.r.s.#.t.g.i.u.i.v.v.v.v.v.v.v.v.i.v.i", -".w.x.y.z.A.B.C.D.E.F.G.H.I.J.i.u.i.v.v.v.v.v.E.F.v.i.i.i", -".w.K.L.M.N.O.P.Q.R.S.T.U.VQt.i.u.i.v.v.v.v.Q.v.v.v.i.u.i", -".w.W.X.Y.Z.0.1.2.3.4.5.6.7.8.i.u.i.v.v.v.v.2.v.v.v.i.u.i", -".w.9#.###a#b#c#d#e#f#g.y#h#i.i.u.i.v.v.v#c#d#e#f.v.i.u.i", -"#j#k#l#m#n#o#p#q#r#s#t#u#v#w.i.u.i.v.v.v.v.v.v.v.v.i.u.i", -".f#x#y#z#A#B#C#C#D#E#F#G#H#I.i.u.u.i.i.i.i.i.i.i.i.u.u.i", -"#J#K#L#M#N#O#P#Q#R#S#T#U#V.y.i.u.u.u.u.u.u.u.u.u.u.u.u.i", -"#J#W#X#Y#Z#0#1#2#3#4#5#6#7.X.i.u.u.i.i.i.i.i.i.i.i.i.u.i", -"#8#9a.a#aaabacadaeafagahaiaj.i.u.u.i.i.i.i.i.i.v.v.i.u.i", -".Lakalaman#2aoadapaqarasatau.i.u.u.i.i.i.i.i.i.v.v.i.u.i", -"#javawaxabacacayaz.EaAaBaCQt.i.u.u.i.i.i.i.i.i.v.v.i.u.i", -"aDaEaFacaGaHaIaJaKaLaM.#.#.e.v.i.i.i.i.i.i.i.i.i.i.i.i.i"}; +static char * btn_save_xpm[] = { +"36 18 181 2", +" c None", +". c #FDD7A6", +"+ c #C87F44", +"@ c #5B3E26", +"# c #1B1B1B", +"$ c #3F3F3F", +"% c #404040", +"& c #1C1C1C", +"* c #F7CEAF", +"= c #C49B80", +"- c #8A7D73", +"; c #6E6E6E", +"> c #7E7E7E", +", c #EA7804", +"' c #FAA94A", +") c #EEB36F", +"! c #D09D6B", +"~ c #CC9A72", +"{ c #DED0C3", +"] c #FAF7F4", +"^ c #FBF6F2", +"/ c #FAF4EE", +"( c #F9F1EA", +"_ c #F8EEE6", +": c #F7ECE2", +"< c #777777", +"[ c #DE9763", +"} c #F2B182", +"| c #E2B693", +"1 c #C9AA91", +"2 c #C6A894", +"3 c #D4C9C0", +"4 c #F2EDE9", +"5 c #F3ECE7", +"6 c #F2E9E2", +"7 c #F0E6DE", +"8 c #EFE2DB", +"9 c #EDE0D7", +"0 c #979797", +"a c #000000", +"b c #B65C03", +"c c #E17504", +"d c #F89A30", +"e c #F5C17F", +"f c #D2975F", +"g c #A18761", +"h c #6E9E98", +"i c #68A4A4", +"j c #69A5A5", +"k c #ABBBB6", +"l c #F6EAE0", +"m c #737373", +"n c #616161", +"o c #B88A62", +"p c #D69663", +"q c #EFA877", +"r c #EABF9B", +"s c #CBA78C", +"t c #AC9F8D", +"u c #92ABA7", +"v c #90AEAE", +"w c #B2BBB8", +"x c #ECDED5", +"y c #959595", +"z c #100E0B", +"A c #291806", +"B c #693502", +"C c #E87B0C", +"D c #EC842F", +"E c #EEA275", +"F c #DBA88D", +"G c #E9DBD2", +"H c #F6ECE3", +"I c #F7EBE1", +"J c #F6E8DD", +"K c #707070", +"L c #696866", +"M c #746C64", +"N c #907962", +"O c #DC9967", +"P c #E09D77", +"Q c #E2AD96", +"R c #D1B0A2", +"S c #DDD1CB", +"T c #ECE0D8", +"U c #EDDFD6", +"V c #ECDCD3", +"W c #939393", +"X c #1A1A1A", +"Y c #717171", +"Z c #202020", +"` c #332215", +" . c #71452A", +".. c #9E6749", +"+. c #B67D5F", +"@. c #6A5344", +"#. c #629B9B", +"$. c #A9B9B4", +"%. c #F5E7DB", +"&. c #6D6D6D", +"*. c #949494", +"=. c #79716B", +"-. c #948075", +";. c #AB8F82", +">. c #B89A8C", +",. c #918680", +"'. c #8DA9A9", +"). c #B1BAB7", +"!. c #EADCD1", +"~. c #929292", +"{. c #7A7A7A", +"]. c #3D3D3D", +"^. c #E2DEDB", +"/. c #CBC6C2", +"(. c #BEB8B3", +"_. c #B9B2AC", +":. c #BEB7B0", +"<. c #D6CBC3", +"[. c #EFE2D6", +"}. c #F4E5D8", +"|. c #696969", +"1. c #989898", +"2. c #7D7D7D", +"3. c #D7D4D1", +"4. c #C6C2C0", +"5. c #BDB9B6", +"6. c #BAB6B2", +"7. c #BDB9B5", +"8. c #CEC6C0", +"9. c #E3D7CE", +"0. c #E9DACF", +"a. c #909090", +"b. c #797979", +"c. c #3C3C3C", +"d. c #676767", +"e. c #666666", +"f. c #7C7C7C", +"g. c #8F8F8F", +"h. c #757575", +"i. c #727272", +"j. c #6B6B6B", +"k. c #646464", +"l. c #626262", +"m. c #969696", +"n. c #919191", +"o. c #8E8E8E", +"p. c #8D8D8D", +"q. c #606060", +"r. c #5F5F5F", +"s. c #8C8C8C", +"t. c #E6E6E6", +"u. c #DBDBDB", +"v. c #D1D1D1", +"w. c #C7C7C7", +"x. c #8B8B8B", +"y. c #5B5B5B", +"z. c #CACACA", +"A. c #C3C3C3", +"B. c #A2A2A2", +"C. c #A1A1A1", +"D. c #8A8A8A", +"E. c #424242", +"F. c #BCBCBC", +"G. c #858585", +"H. c #838383", +"I. c #585858", +"J. c #7F7F7F", +"K. c #9E9E9E", +"L. c #9D9D9D", +"M. c #898989", +"N. c #B2B2B2", +"O. c #7B7B7B", +"P. c #545454", +"Q. c #B6B6B6", +"R. c #9A9A9A", +"S. c #999999", +"T. c #878787", +"U. c #A7A7A7", +"V. c #535353", +"W. c #AFAFAF", +"X. c #868686", +" ", +". + @ # $ % % % % % % % & & * = - ; > > > > > > > > ; ; ", +", ' ) ! ~ { ] ^ / ( _ : % < & [ } | 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 v w x > y ; ", +" z 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 ` ...+.@.#.$.%.% &.& &.*.K =.-.;.>.,.'.).!.> ~.; ", +" & {.].^./.(._.:.<.[.}.% |.& ; 1.2.3.4.5.6.7.8.9.0.> a.; ", +" & b.< $ ].c.c.c.].$ % d.e.& ; 1.0 > 2.f.f.f.2.> > g.g.; ", +" & h.m i.K ; &.j.|.d.e.k.l.& ; m.y *.W ~.~.n.a.g.g.o.p.; ", +" & i.K ; % % % % % % % q.r.& ; *.W ~.> > > > > > > s.s.; ", +" & ; &.% t.u.v.w.% o.x.% y.& ; ~.~.> u.v.z.A.> B.C.> D.; ", +" & j.|.% u.E.E.F.% G.H.% I.& ; n.a.> v.J.J.F.> K.L.> M.; ", +" & d.e.% v.E.e.N.% 2.O.% P.& ; g.g.> z.J.g.Q.> R.S.> T.; ", +" & k.l.% w.F.N.U.% h.m % V.& ; o.p.> A.F.Q.W.> m.y > X.; ", +" & & & % % % % & & & & & ; ; ; > > > > ; ; ; ; ; ", +" ", +" ", +" "}; diff --git a/images/laz_images.lrs b/images/laz_images.lrs index ff2df7c246..da179b10de 100644 --- a/images/laz_images.lrs +++ b/images/laz_images.lrs @@ -71,48 +71,47 @@ LazarusResources.Add('btn_newunit','XPM',[ +#10'"{..=~..+].^"};'#10 ]); LazarusResources.Add('btn_openfile','XPM',[ - '/* XPM */'#10'static char * btn_openfile_xpm[] = {'#10'"16 13 111 2",'#10'" ' - +' '#9'c None",'#10'". '#9'c #020703",'#10'"+ '#9'c #000100",'#10'"@ '#9'c #0' - +'00004",'#10'"# '#9'c #000005",'#10'"$ '#9'c #040507",'#10'"% '#9'c #000000"' - +','#10'"& '#9'c #010200",'#10'"* '#9'c #030400",'#10'"= '#9'c #090900",'#10 - +'"- '#9'c #040400",'#10'"; '#9'c #010100",'#10'"> '#9'c #040300",'#10'", '#9 - +'c #EDF0B9",'#10'"'' '#9'c #FFFFBD",'#10'") '#9'c #EBEDA4",'#10'"! '#9'c #0A' - +'0B00",'#10'"~ '#9'c #070600",'#10'"{ '#9'c #060400",'#10'"] '#9'c #141300",' - +#10'"^ '#9'c #030200",'#10'"/ '#9'c #060500",'#10'"( '#9'c #FFFFB8",'#10'"_ ' - +#9'c #EEF58E",'#10'": '#9'c #FCFF94",'#10'"< '#9'c #E9EF85",'#10'"[ '#9'c #F' - +'FFFB1",'#10'"} '#9'c #E7E89C",'#10'"| '#9'c #E1E3A4",'#10'"1 '#9'c #FFFFD1"' - +','#10'"2 '#9'c #090A00",'#10'"3 '#9'c #0D0B00",'#10'"4 '#9'c #E7EA8F",'#10 - +'"5 '#9'c #FFFF98",'#10'"6 '#9'c #F0F776",'#10'"7 '#9'c #FFFF92",'#10'"8 '#9 - +'c #F0EE89",'#10'"9 '#9'c #FFFFAF",'#10'"0 '#9'c #F8FBA2",'#10'"a '#9'c #FEF' - +'FAE",'#10'"b '#9'c #EFF0AA",'#10'"c '#9'c #060600",'#10'"d '#9'c #070300",' - +#10'"e '#9'c #FEFEA8",'#10'"f '#9'c #F2F582",'#10'"g '#9'c #FFFF8F",'#10'"h ' - +#9'c #F2F37C",'#10'"i '#9'c #0E0900",'#10'"j '#9'c #0D0800",'#10'"k '#9'c #0' - +'A0900",'#10'"l '#9'c #080A00",'#10'"m '#9'c #0A0A00",'#10'"n '#9'c #070500"' - +','#10'"o '#9'c #030000",'#10'"p '#9'c #F6F4A7",'#10'"q '#9'c #FFFF9D",'#10 - +'"r '#9'c #EFF07B",'#10'"s '#9'c #111100",'#10'"t '#9'c #7B7716",'#10'"u '#9 - +'c #89852A",'#10'"v '#9'c #818121",'#10'"w '#9'c #7F8022",'#10'"x '#9'c #828' - +'22C",'#10'"y '#9'c #7A7B2D",'#10'"z '#9'c #7B7C3A",'#10'"A '#9'c #84844E",' - +#10'"B '#9'c #75764E",'#10'"C '#9'c #0A0800",'#10'"D '#9'c #FFFFC5",'#10'"E ' - +#9'c #E7EA91",'#10'"F '#9'c #0E1100",'#10'"G '#9'c #7E8211",'#10'"H '#9'c #8' - +'08310",'#10'"I '#9'c #878B13",'#10'"J '#9'c #7F8308",'#10'"K '#9'c #83870E"' - +','#10'"L '#9'c #7B7F11",'#10'"M '#9'c #818526",'#10'"N '#9'c #797C2F",'#10 - +'"O '#9'c #7C7D43",'#10'"P '#9'c #040500",'#10'"Q '#9'c #E3E3AD",'#10'"R '#9 - +'c #7F842A",'#10'"S '#9'c #767B15",'#10'"T '#9'c #848B1B",'#10'"U '#9'c #747' - +'903",'#10'"V '#9'c #7D8108",'#10'"W '#9'c #7F820F",'#10'"X '#9'c #858821",' - +#10'"Y '#9'c #797C23",'#10'"Z '#9'c #7F823B",'#10'"` '#9'c #0A0D00",'#10'" .' - +#9'c #050300",'#10'"..'#9'c #070800",'#10'"+.'#9'c #7B7B45",'#10'"@.'#9'c #7' - +'37631",'#10'"#.'#9'c #878A3B",'#10'"$.'#9'c #7B7F28",'#10'"%.'#9'c #82852A"' - +','#10'"&.'#9'c #7C7F28",'#10'"*.'#9'c #858636",'#10'"=.'#9'c #7B7B33",'#10 - +'"-.'#9'c #7A7A3E",'#10'";.'#9'c #030100",'#10'">.'#9'c #101000",'#10'",.'#9 - +'c #040600",'#10'"''.'#9'c #040700",'#10'").'#9'c #060700",'#10'"!.'#9'c #09' - +'0800",'#10'"~.'#9'c #0E0B00",'#10'"{.'#9'c #070400",'#10'" ' - +' . + @ ",'#10'" # $ % ",'#10'" ' - +' & + ",'#10'" * = - ; = ; ",'#10'"> , '' ' - +') ! ~ { > ] ^ ^ ",'#10'"/ ( _ : < [ } '' | 1 2 ",'#10'"' - +'3 4 5 6 7 8 9 0 a b c ",'#10'"d e f g h i j k l m m n { > ^ o ",' - +#10'"d p q r s t u v w x y z A B c ",'#10'"C D E F G H I J K L M N O P ' - +' ",'#10'"- Q ! R S T U V W X Y Z ` ",'#10'" ...+.@.#.$.%.&.*.=.-./ ' - +' ",'#10'";.>.- ,.''...).!.n ~.{. "};'#10 + '/* XPM */'#10'static char * btn_openfile_xpm[] = {'#10'"18 18 97 2",'#10'" ' + +#9'c None",'#10'". '#9'c #000000",'#10'"+ '#9'c #4E331B",'#10'"@ '#9'c #E5A5' + +'66",'#10'"# '#9'c #FED39A",'#10'"$ '#9'c #FEC585",'#10'"% '#9'c #FDC587",' + +#10'"& '#9'c #FEC282",'#10'"* '#9'c #F8AC62",'#10'"= '#9'c #FEC88A",'#10'"- ' + +#9'c #53504D",'#10'"; '#9'c #55524F",'#10'"> '#9'c #5C5A57",'#10'", '#9'c #5' + +'4514E",'#10'"'' '#9'c #565350",'#10'") '#9'c #C4864E",'#10'"! '#9'c #524F4C' + +'",'#10'"~ '#9'c #F5F5F5",'#10'"{ '#9'c #ECECEC",'#10'"] '#9'c #E4E4E4",'#10 + +'"^ '#9'c #DCDCDC",'#10'"/ '#9'c #D4D4D4",'#10'"( '#9'c #CBCBCB",'#10'"_ '#9 + +'c #C4C4C4",'#10'": '#9'c #BCBCBC",'#10'"< '#9'c #B5B5B5",'#10'"[ '#9'c #B3B' + +'3B3",'#10'"} '#9'c #303030",'#10'"| '#9'c #4A3119",'#10'"1 '#9'c #DBDBDB",' + +#10'"2 '#9'c #DFDFDE",'#10'"3 '#9'c #E8E8E7",'#10'"4 '#9'c #E6E6E4",'#10'"5 ' + +#9'c #D2D2D1",'#10'"6 '#9'c #C7C7C6",'#10'"7 '#9'c #BABAB9",'#10'"8 '#9'c #A' + +'DADAC",'#10'"9 '#9'c #A0A09F",'#10'"0 '#9'c #949493",'#10'"a '#9'c #494948"' + +','#10'"b '#9'c #B77D44",'#10'"c '#9'c #53514E",'#10'"d '#9'c #DADADA",'#10 + +'"e '#9'c #DBDBDA",'#10'"f '#9'c #E1E1E0",'#10'"g '#9'c #DDDDDC",'#10'"h '#9 + +'c #D6D6D5",'#10'"i '#9'c #CBCBCA",'#10'"j '#9'c #C1C1C0",'#10'"k '#9'c #B6B' + +'6B5",'#10'"l '#9'c #A9A9A8",'#10'"m '#9'c #686867",'#10'"n '#9'c #222221",' + +#10'"o '#9'c #493018",'#10'"p '#9'c #CDCDCD",'#10'"q '#9'c #CACAC9",'#10'"r ' + +#9'c #D5D5D4",'#10'"s '#9'c #D2D2D0",'#10'"t '#9'c #CCCCCB",'#10'"u '#9'c #C' + +'2C2C1",'#10'"v '#9'c #B9B9B8",'#10'"w '#9'c #AFAFAE",'#10'"x '#9'c #A2A2A1"' + +','#10'"y '#9'c #959594",'#10'"z '#9'c #CECECE",'#10'"A '#9'c #BEBEBC",'#10 + +'"B '#9'c #C4C4C2",'#10'"C '#9'c #C6C6C5",'#10'"D '#9'c #C3C3C2",'#10'"E '#9 + +'c #BFBFBE",'#10'"F '#9'c #AEAEAD",'#10'"G '#9'c #A5A5A4",'#10'"H '#9'c #9E9' + +'E9D",'#10'"I '#9'c #6F6F6E",'#10'"J '#9'c #121212",'#10'"K '#9'c #BDBDBD",' + +#10'"L '#9'c #A6A6A5",'#10'"M '#9'c #AAAAA8",'#10'"N '#9'c #ADADAB",'#10'"O ' + +#9'c #AEAEAC",'#10'"P '#9'c #ABABAA",'#10'"Q '#9'c #A7A7A6",'#10'"R '#9'c #A' + +'1A1A0",'#10'"S '#9'c #9A9A99",'#10'"T '#9'c #949492",'#10'"U '#9'c #8D8D8B"' + +','#10'"V '#9'c #232323",'#10'"W '#9'c #4A4A4A",'#10'"X '#9'c #4A4A49",'#10 + +'"Y '#9'c #4C4C4B",'#10'"Z '#9'c #4C4C4C",'#10'"` '#9'c #4B4B4A",'#10'" .'#9 + +'c #464646",'#10'"..'#9'c #434343",'#10'"+.'#9'c #414140",'#10'"@.'#9'c #343' + +'433",'#10'"#.'#9'c #1F1F1E",'#10'" . . . . ",'#10 + +'" . . . . . . . ",'#10'" . . . . . ' + +' ",'#10'" . . . ",'#10'" ' + +' . . . . ",'#10'" + + + + ",'#10'"+ @ ' + +'# $ @ + + + + + + + ",'#10'"+ # % & * * * * * * * * . ' + +' ",'#10'"+ = & + - - ; > , , '' '' , . . . ",'#10'"+ & ) ! ~ ~ { ] ^ / ' + +'( _ : < [ } ",'#10'"+ & | 1 2 3 4 2 5 6 7 8 9 0 a ",'#10'"+ b c d' + +' e f g h i j k l 9 m n ",'#10'"+ o p q r r s t u v w x y a ",' + +#10'"+ '' z A B C D E k F G H I J ",'#10'"+ K L M N O P Q R S T U a ' + +' ",'#10'"V W X Y Z Y ` a ...+.@.#. ",'#10'" ' + +' ",'#10'" "};'#10 ]); LazarusResources.Add('btn_pause','XPM',[ '/* XPM */'#10'static char * btn_pause_xpm[] = {'#10'"20 14 8 1",'#10'" '#9'c' @@ -194,64 +193,82 @@ LazarusResources.Add('btn_saveall','XPM',[ +'"].n.o.;.p.q.r.s.g t.-. ",'#10'" K b u.v.w.x.@ y.{ y. "};'#10 ]); LazarusResources.Add('btn_save','XPM',[ - '/* XPM */'#10'static char *btn_save[]={'#10'"28 14 169 2",'#10'"aD c None",' - +#10'".e c #000000",'#10'".a c #000002",'#10'".b c #000005",'#10'".d c #00000' - +'7",'#10'".c c #00000c",'#10'"Qt c #000100",'#10'".g c #000200",'#10'".# c #' - +'000400",'#10'".I c #000600",'#10'".8 c #010000",'#10'"aK c #01000c",'#10'"a' - +'z c #01000e",'#10'"aj c #010100",'#10'".w c #010200",'#10'"#j c #010300",' - +#10'".f c #010400",'#10'"#J c #010500",'#10'".U c #010600",'#10'".6 c #01070' - +'0",'#10'"ah c #010a00",'#10'".J c #020300",'#10'"#8 c #020500",'#10'".k c #' - +'020600",'#10'"aG c #030000",'#10'"aJ c #03000b",'#10'"ap c #030010",'#10'"a' - +'E c #030500",'#10'".y c #030600",'#10'"#6 c #030c00",'#10'"ac c #040000",' - +#10'"ad c #04000e",'#10'".L c #040600",'#10'"aB c #040900",'#10'"#3 c #05000' - +'0",'#10'"ay c #05000e",'#10'"aI c #050102",'#10'"#4 c #050200",'#10'"aL c #' - +'050209",'#10'".h c #050704",'#10'"#2 c #060000",'#10'"ab c #060100",'#10'"a' - +'m c #060200",'#10'"#E c #060600",'#10'"#I c #060800",'#10'"#Z c #070100",' - +#10'"a# c #070300",'#10'"aH c #070400",'#10'"#C c #070500",'#10'"#l c #07070' - +'0",'#10'"aM c #070800",'#10'".X c #070900",'#10'"ao c #080300",'#10'"#i c #' - +'08050c",'#10'"#z c #080700",'#10'"au c #080901",'#10'"#5 c #080b00",'#10'"#' - +'F c #080e00",'#10'"aa c #090300",'#10'"#0 c #090400",'#10'"#Y c #090700",' - +#10'"ae c #0a0219",'#10'"ax c #0a0500",'#10'"#D c #0a0a00",'#10'"aF c #0a0c0' - +'0",'#10'"#. c #0b0a00",'#10'"#w c #0c0904",'#10'".H c #0c1200",'#10'"as c #' - +'0c1300",'#10'"an c #0d0600",'#10'"#1 c #0d0900",'#10'"#A c #0e0c00",'#10'"#' - +'u c #0f1400",'#10'"#B c #141200",'#10'".i c #585858",'#10'"at c #666c3c",' - +#10'"#v c #6d723a",'#10'"#h c #6f744c",'#10'".V c #707650",'#10'"#G c #727d1' - +'7",'#10'"aw c #74783d",'#10'"#7 c #747f33",'#10'"#V c #74801e",'#10'"aC c #' - +'757b57",'#10'".9 c #767849",'#10'"#T c #777d35",'#10'"#M c #78782e",'#10'".' - +'K c #787b4e",'#10'".j c #787c5b",'#10'"#x c #787e28",'#10'"ak c #787f32",' - +#10'"#P c #797744",'#10'".W c #797b4c",'#10'"#K c #79811e",'#10'"#N c #7a794' - +'1",'#10'".x c #7a7c54",'#10'"#X c #7a8119",'#10'"#O c #7b7a42",'#10'"#R c #' - +'7b7a4c",'#10'"#9 c #7b8127",'#10'"#y c #7c801f",'#10'"#W c #7c8323",'#10'"#' - +'Q c #7e7b4e",'#10'"al c #7e8235",'#10'"av c #7f8348",'#10'"#H c #7f8a2e",' - +#10'"#U c #7f8b1f",'#10'"#S c #80804e",'#10'".u c #808080",'#10'"#k c #80814' - +'7",'#10'".7 c #81865e",'#10'"ai c #828a4f",'#10'"a. c #83882c",'#10'"#L c #' - +'8a9121",'#10'"aA c #bebfb1",'#10'".G c #bec0b2",'#10'".o c #c0bebf",'#10'".' - +'Y c #c1bca8",'#10'".2 c #c3bdbd",'#10'".v c #c3c3c3",'#10'".s c #c3c4bc",' - +#10'"#n c #c4bdab",'#10'"#o c #c4bdad",'#10'"#f c #c4bebe",'#10'".P c #c4c1b' - +'c",'#10'".E c #c4c2c7",'#10'".0 c #c5c0bc",'#10'".l c #c5c6b6",'#10'".t c #' - +'c5c9b2",'#10'"#c c #c6bdbe",'#10'".D c #c6c4c7",'#10'".z c #c6c5b0",'#10'".' - +'n c #c6c5c1",'#10'"aq c #c7c2c6",'#10'".Q c #c7c3c4",'#10'".N c #c7c4bb",' - +#10'".B c #c7c4bd",'#10'".p c #c7c4cd",'#10'".S c #c7c6c2",'#10'".F c #c7c6c' - +'4",'#10'".A c #c7c7bd",'#10'".5 c #c7c9b4",'#10'"#a c #c8c0bd",'#10'"#r c #' - +'c8c2b4",'#10'".R c #c8c6c7",'#10'".T c #c8c9b7",'#10'"#d c #c9c0c3",'#10'"#' - +'s c #c9c3b3",'#10'".r c #c9c9cb",'#10'"af c #cac6c7",'#10'".m c #cac9c4",' - +#10'"#t c #cacaa8",'#10'"#g c #cbcab8",'#10'"#e c #ccc6c8",'#10'".O c #ccc7c' - +'1",'#10'".3 c #ccc8c7",'#10'".q c #ccc9d2",'#10'"ag c #ccccb2",'#10'".4 c #' - +'cdc9c6",'#10'".Z c #cecac1",'#10'"## c #cfc8b6",'#10'"ar c #cfd1bc",'#10'"#' - +'q c #d0cabc",'#10'"#m c #d0cbab",'#10'".C c #d0cfcb",'#10'"#p c #d2ccbe",' - +#10'".M c #d3d1ba",'#10'"#b c #d5cccd",'#10'".1 c #d6d1ce",'#10'"Qt.#.#Qt.a.' - +'a.b.c.c.d.e.f.g.h.i.i.i.i.i.i.i.i.i.i.i.i.i.i",'#10'".g.j.k.l.m.n.o.p.q.r.s' - +'.#.t.g.i.u.i.v.v.v.v.v.v.v.v.i.v.i",'#10'".w.x.y.z.A.B.C.D.E.F.G.H.I.J.i.u.' - +'i.v.v.v.v.v.E.F.v.i.i.i",'#10'".w.K.L.M.N.O.P.Q.R.S.T.U.VQt.i.u.i.v.v.v.v.Q' - +'.v.v.v.i.u.i",'#10'".w.W.X.Y.Z.0.1.2.3.4.5.6.7.8.i.u.i.v.v.v.v.2.v.v.v.i.u.' - +'i",'#10'".w.9#.###a#b#c#d#e#f#g.y#h#i.i.u.i.v.v.v#c#d#e#f.v.i.u.i",'#10'"#j' - +'#k#l#m#n#o#p#q#r#s#t#u#v#w.i.u.i.v.v.v.v.v.v.v.v.i.u.i",'#10'".f#x#y#z#A#B#' - +'C#C#D#E#F#G#H#I.i.u.u.i.i.i.i.i.i.i.i.u.u.i",'#10'"#J#K#L#M#N#O#P#Q#R#S#T#U' - +'#V.y.i.u.u.u.u.u.u.u.u.u.u.u.u.i",'#10'"#J#W#X#Y#Z#0#1#2#3#4#5#6#7.X.i.u.u.' - +'i.i.i.i.i.i.i.i.i.u.i",'#10'"#8#9a.a#aaabacadaeafagahaiaj.i.u.u.i.i.i.i.i.i' - +'.v.v.i.u.i",'#10'".Lakalaman#2aoadapaqarasatau.i.u.u.i.i.i.i.i.i.v.v.i.u.i"' - +','#10'"#javawaxabacacayaz.EaAaBaCQt.i.u.u.i.i.i.i.i.i.v.v.i.u.i",'#10'"aDaE' - +'aFacaGaHaIaJaKaLaM.#.#.e.v.i.i.i.i.i.i.i.i.i.i.i.i.i"};'#10 + '/* XPM */'#10'static char * btn_save_xpm[] = {'#10'"36 18 181 2",'#10'" '#9 + +'c None",'#10'". '#9'c #FDD7A6",'#10'"+ '#9'c #C87F44",'#10'"@ '#9'c #5B3E26' + +'",'#10'"# '#9'c #1B1B1B",'#10'"$ '#9'c #3F3F3F",'#10'"% '#9'c #404040",'#10 + +'"& '#9'c #1C1C1C",'#10'"* '#9'c #F7CEAF",'#10'"= '#9'c #C49B80",'#10'"- '#9 + +'c #8A7D73",'#10'"; '#9'c #6E6E6E",'#10'"> '#9'c #7E7E7E",'#10'", '#9'c #EA7' + +'804",'#10'"'' '#9'c #FAA94A",'#10'") '#9'c #EEB36F",'#10'"! '#9'c #D09D6B",' + +#10'"~ '#9'c #CC9A72",'#10'"{ '#9'c #DED0C3",'#10'"] '#9'c #FAF7F4",'#10'"^ ' + +#9'c #FBF6F2",'#10'"/ '#9'c #FAF4EE",'#10'"( '#9'c #F9F1EA",'#10'"_ '#9'c #F' + +'8EEE6",'#10'": '#9'c #F7ECE2",'#10'"< '#9'c #777777",'#10'"[ '#9'c #DE9763"' + +','#10'"} '#9'c #F2B182",'#10'"| '#9'c #E2B693",'#10'"1 '#9'c #C9AA91",'#10 + +'"2 '#9'c #C6A894",'#10'"3 '#9'c #D4C9C0",'#10'"4 '#9'c #F2EDE9",'#10'"5 '#9 + +'c #F3ECE7",'#10'"6 '#9'c #F2E9E2",'#10'"7 '#9'c #F0E6DE",'#10'"8 '#9'c #EFE' + +'2DB",'#10'"9 '#9'c #EDE0D7",'#10'"0 '#9'c #979797",'#10'"a '#9'c #000000",' + +#10'"b '#9'c #B65C03",'#10'"c '#9'c #E17504",'#10'"d '#9'c #F89A30",'#10'"e ' + +#9'c #F5C17F",'#10'"f '#9'c #D2975F",'#10'"g '#9'c #A18761",'#10'"h '#9'c #6' + +'E9E98",'#10'"i '#9'c #68A4A4",'#10'"j '#9'c #69A5A5",'#10'"k '#9'c #ABBBB6"' + +','#10'"l '#9'c #F6EAE0",'#10'"m '#9'c #737373",'#10'"n '#9'c #616161",'#10 + +'"o '#9'c #B88A62",'#10'"p '#9'c #D69663",'#10'"q '#9'c #EFA877",'#10'"r '#9 + +'c #EABF9B",'#10'"s '#9'c #CBA78C",'#10'"t '#9'c #AC9F8D",'#10'"u '#9'c #92A' + +'BA7",'#10'"v '#9'c #90AEAE",'#10'"w '#9'c #B2BBB8",'#10'"x '#9'c #ECDED5",' + +#10'"y '#9'c #959595",'#10'"z '#9'c #100E0B",'#10'"A '#9'c #291806",'#10'"B ' + +#9'c #693502",'#10'"C '#9'c #E87B0C",'#10'"D '#9'c #EC842F",'#10'"E '#9'c #E' + +'EA275",'#10'"F '#9'c #DBA88D",'#10'"G '#9'c #E9DBD2",'#10'"H '#9'c #F6ECE3"' + +','#10'"I '#9'c #F7EBE1",'#10'"J '#9'c #F6E8DD",'#10'"K '#9'c #707070",'#10 + +'"L '#9'c #696866",'#10'"M '#9'c #746C64",'#10'"N '#9'c #907962",'#10'"O '#9 + +'c #DC9967",'#10'"P '#9'c #E09D77",'#10'"Q '#9'c #E2AD96",'#10'"R '#9'c #D1B' + +'0A2",'#10'"S '#9'c #DDD1CB",'#10'"T '#9'c #ECE0D8",'#10'"U '#9'c #EDDFD6",' + +#10'"V '#9'c #ECDCD3",'#10'"W '#9'c #939393",'#10'"X '#9'c #1A1A1A",'#10'"Y ' + +#9'c #717171",'#10'"Z '#9'c #202020",'#10'"` '#9'c #332215",'#10'" .'#9'c #7' + +'1452A",'#10'"..'#9'c #9E6749",'#10'"+.'#9'c #B67D5F",'#10'"@.'#9'c #6A5344"' + +','#10'"#.'#9'c #629B9B",'#10'"$.'#9'c #A9B9B4",'#10'"%.'#9'c #F5E7DB",'#10 + +'"&.'#9'c #6D6D6D",'#10'"*.'#9'c #949494",'#10'"=.'#9'c #79716B",'#10'"-.'#9 + +'c #948075",'#10'";.'#9'c #AB8F82",'#10'">.'#9'c #B89A8C",'#10'",.'#9'c #918' + +'680",'#10'"''.'#9'c #8DA9A9",'#10'").'#9'c #B1BAB7",'#10'"!.'#9'c #EADCD1",' + +#10'"~.'#9'c #929292",'#10'"{.'#9'c #7A7A7A",'#10'"].'#9'c #3D3D3D",'#10'"^.' + +#9'c #E2DEDB",'#10'"/.'#9'c #CBC6C2",'#10'"(.'#9'c #BEB8B3",'#10'"_.'#9'c #B' + +'9B2AC",'#10'":.'#9'c #BEB7B0",'#10'"<.'#9'c #D6CBC3",'#10'"[.'#9'c #EFE2D6"' + +','#10'"}.'#9'c #F4E5D8",'#10'"|.'#9'c #696969",'#10'"1.'#9'c #989898",'#10 + +'"2.'#9'c #7D7D7D",'#10'"3.'#9'c #D7D4D1",'#10'"4.'#9'c #C6C2C0",'#10'"5.'#9 + +'c #BDB9B6",'#10'"6.'#9'c #BAB6B2",'#10'"7.'#9'c #BDB9B5",'#10'"8.'#9'c #CEC' + +'6C0",'#10'"9.'#9'c #E3D7CE",'#10'"0.'#9'c #E9DACF",'#10'"a.'#9'c #909090",' + +#10'"b.'#9'c #797979",'#10'"c.'#9'c #3C3C3C",'#10'"d.'#9'c #676767",'#10'"e.' + +#9'c #666666",'#10'"f.'#9'c #7C7C7C",'#10'"g.'#9'c #8F8F8F",'#10'"h.'#9'c #7' + +'57575",'#10'"i.'#9'c #727272",'#10'"j.'#9'c #6B6B6B",'#10'"k.'#9'c #646464"' + +','#10'"l.'#9'c #626262",'#10'"m.'#9'c #969696",'#10'"n.'#9'c #919191",'#10 + +'"o.'#9'c #8E8E8E",'#10'"p.'#9'c #8D8D8D",'#10'"q.'#9'c #606060",'#10'"r.'#9 + +'c #5F5F5F",'#10'"s.'#9'c #8C8C8C",'#10'"t.'#9'c #E6E6E6",'#10'"u.'#9'c #DBD' + +'BDB",'#10'"v.'#9'c #D1D1D1",'#10'"w.'#9'c #C7C7C7",'#10'"x.'#9'c #8B8B8B",' + +#10'"y.'#9'c #5B5B5B",'#10'"z.'#9'c #CACACA",'#10'"A.'#9'c #C3C3C3",'#10'"B.' + +#9'c #A2A2A2",'#10'"C.'#9'c #A1A1A1",'#10'"D.'#9'c #8A8A8A",'#10'"E.'#9'c #4' + +'24242",'#10'"F.'#9'c #BCBCBC",'#10'"G.'#9'c #858585",'#10'"H.'#9'c #838383"' + +','#10'"I.'#9'c #585858",'#10'"J.'#9'c #7F7F7F",'#10'"K.'#9'c #9E9E9E",'#10 + +'"L.'#9'c #9D9D9D",'#10'"M.'#9'c #898989",'#10'"N.'#9'c #B2B2B2",'#10'"O.'#9 + +'c #7B7B7B",'#10'"P.'#9'c #545454",'#10'"Q.'#9'c #B6B6B6",'#10'"R.'#9'c #9A9' + +'A9A",'#10'"S.'#9'c #999999",'#10'"T.'#9'c #878787",'#10'"U.'#9'c #A7A7A7",' + +#10'"V.'#9'c #535353",'#10'"W.'#9'c #AFAFAF",'#10'"X.'#9'c #868686",'#10'" ' + +' ",'#10 + +'". + @ # $ % % % % % % % & & * = - ; > > > > > > > > ; ; ",' + +#10'", '' ) ! ~ { ] ^ / ( _ : % < & [ } | 1 2 3 4 5 6 7 8 9 > 0 ; ' + +' ",'#10'"a b c d e f g h i j k l % m & n o p q r s t u v v w x > y ;' + +' ",'#10'" z A B C D E F G H I J % K & L M N O P Q R S T U V ' + +'> W ; ",'#10'" X Y Z ` ...+.@.#.$.%.% &.& &.*.K =.-.;.>.,.' + +'''.).!.> ~.; ",'#10'" & {.].^./.(._.:.<.[.}.% |.& ; 1.2.3.4.' + +'5.6.7.8.9.0.> a.; ",'#10'" & b.< $ ].c.c.c.].$ % d.e.& ; 1.0' + ,' > 2.f.f.f.2.> > g.g.; ",'#10'" & h.m i.K ; &.j.|.d.e.k.l.& ' + +'; m.y *.W ~.~.n.a.g.g.o.p.; ",'#10'" & i.K ; % % % % % % % q.r.& ' + +' ; *.W ~.> > > > > > > s.s.; ",'#10'" & ; &.% t.u.v.w.% o.x.% y.' + +'& ; ~.~.> u.v.z.A.> B.C.> D.; ",'#10'" & j.|.% u.E.E.F.% G.H' + +'.% I.& ; n.a.> v.J.J.F.> K.L.> M.; ",'#10'" & d.e.% v.E.e.N.' + +'% 2.O.% P.& ; g.g.> z.J.g.Q.> R.S.> T.; ",'#10'" & k.l.% w.F' + +'.N.U.% h.m % V.& ; o.p.> A.F.Q.W.> m.y > X.; ",'#10'" & & ' + +'& % % % % & & & & & ; ; ; > > > > ; ; ; ; ; ",'#10'" ' + +' ",'#10 + +'" ",' + +#10'" ' + +' "};'#10 ]); LazarusResources.Add('btn_stepinto','XPM',[ '/* XPM */'#10'static char * btn_stepinto_xpm[] = {'#10'"13 16 5 1",'#10'" '#9 diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index 3773a8ac49..9a8472475c 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -112,7 +112,7 @@ type procedure SetSimplePanel(Value : Boolean); Procedure WMPaint(var Msg: TLMPaint); message LM_PAINT; Procedure DrawDivider(X : Integer); - Procedure DrawBevel(xLeft, PanelNum : Integer ); + Procedure DrawBevel(xLeft, PanelNum : Integer); public constructor Create(AOwner : TComponent); override; destructor Destroy; override; @@ -2037,6 +2037,9 @@ end. { ============================================================================= $Log$ + Revision 1.85 2003/08/30 18:53:07 mattias + using default colors, when theme does not define them + Revision 1.84 2003/08/22 18:10:39 mattias implemented selections in component tree diff --git a/lcl/include/statusbar.inc b/lcl/include/statusbar.inc index a171ef21e8..d6ab8e5fcc 100644 --- a/lcl/include/statusbar.inc +++ b/lcl/include/statusbar.inc @@ -171,9 +171,9 @@ End; Procedure TStatusBar.DrawDivider(X : Integer); Begin Canvas.Pen.Width:=1; - Canvas.Pen.Color := clBtnFace; + Canvas.Pen.Color := clBtnHighlight; Canvas.Line(X,Top,X,Top+Height-1); - Canvas.Pen.Color := clBtnFace; + Canvas.Pen.Color := clBtnShadow; Canvas.Line(X+1,Top,X+1,Top+Height-1); End; diff --git a/lcl/interfaces/gtk/gtkcallback.inc b/lcl/interfaces/gtk/gtkcallback.inc index cead0a58b2..d716e91059 100644 --- a/lcl/interfaces/gtk/gtkcallback.inc +++ b/lcl/interfaces/gtk/gtkcallback.inc @@ -162,9 +162,11 @@ end; GTKRealizeAfterCB is called by the gtk, whenever a widget is realized (ie mapped), and after the widget itself got the realize signal. That means that the gdk window on the xserver has been created and the widget - has initialized the gdkwindow. This function is used for the second part of + initialized the gdkwindow. This function is used for the second part of the initialization of a widget. + -------------------------------------------------------------------------------} + {$IFDEF CustomFonts} procedure ModifyWidgetStyle(AWinControl: TWinControl; AWidget: PGtkWidget); {$IFDEF Win32} @@ -175,14 +177,16 @@ end; var RCStyle: PGtkRcStyle; begin + {$IFDEF NoStyle} + exit; + {$ENDIF} if not (AWinControl is TButton) then exit; writeln('ModifyWidgetStyle A ',AWinControl.Name,':',AWinControl.ClassName,' AWidget=',HexStr(Cardinal(AWidget),8)); RCStyle:=gtk_rc_style_new; g_free(RCStyle^.font_name); RCStyle^.font_name:=g_strdup('-urw-chancery l-medium-i-normal-*-*-140-*-*-p-*-iso8859-2'); - // MG: somehow I only got access violations - gtk_widget_modify_style(AWidget,@RCStyle); + gtk_widget_modify_style(AWidget,RCStyle); g_free(RCStyle^.font_name); RCStyle^.font_name:=nil; @@ -2841,6 +2845,9 @@ end; { ============================================================================= $Log$ + Revision 1.185 2003/08/30 18:53:07 mattias + using default colors, when theme does not define them + Revision 1.184 2003/08/29 21:21:07 mattias fixes for gtk2 diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc index dafd490811..ee0221b1b6 100644 --- a/lcl/interfaces/gtk/gtkobject.inc +++ b/lcl/interfaces/gtk/gtkobject.inc @@ -3758,6 +3758,9 @@ var RCStyle : PGtkRCStyle; Widget, FixWidget : PGTKWidget; begin + {$IFDEF NoStyle} + exit; + {$ENDIF} if Sender is TWinControl then with TWinControl(Sender) do begin @@ -5122,7 +5125,6 @@ Procedure TgtkObject.FinishComponentCreate(Sender : TObject; Handle : Pointer; SetupProps : Boolean); begin // MWE: next will be obsoleted by WinWidgetInfo - //Set these for functions like GetWindowLong Added 01/07/2000 if Handle <> nil then Begin SetLCLObject(Handle, Sender); @@ -5154,8 +5156,10 @@ begin if SetupProps then SetProperties(Sender); if Handle <> nil then begin + {$IFNDEF NoStyle} if Sender is TCustomForm then gtk_widget_set_app_paintable(Handle,true); + {$ENDIF} HookSignals(Sender); end; end; @@ -8064,6 +8068,9 @@ end; { ============================================================================= $Log$ + Revision 1.402 2003/08/30 18:53:07 mattias + using default colors, when theme does not define them + Revision 1.401 2003/08/29 21:21:07 mattias fixes for gtk2 diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc index 5a56992a06..caf88b41d7 100644 --- a/lcl/interfaces/gtk/gtkproc.inc +++ b/lcl/interfaces/gtk/gtkproc.inc @@ -528,7 +528,15 @@ var gdk_gc_set_fill(GC, fill); AllocFG := Foreground.Pixel = 0; If AllocFG then - gdk_colormap_alloc_color(GDK_Colormap_get_system,@Foreground,True,True); + if not gdk_colormap_alloc_color(GDK_Colormap_get_system,@Foreground, + True,True) + then begin + writeln('NOTE: EnsureGCColor.EnsureAsGCValues gdk_colormap_alloc_color failed ', + HexStr(Cardinal(Foreground.red),4),',', + HexStr(Cardinal(Foreground.green),4),',', + HexStr(Cardinal(Foreground.blue),4) + ); + end; gdk_gc_set_foreground(GC, @foreground); Case Fill of GDK_TILED : @@ -587,7 +595,7 @@ begin end; Case TColor(GDIColor^.ColorRef) of - //clScrollbar, + //clScrollbar: see above clInfoBk, clMenu, clHighlight, @@ -612,10 +620,8 @@ begin else EnsureAsColor; end; - {$DEFINE Bla1} end; -{$DEFINE Bla2} procedure CopyGDIColor(var SourceGDIColor, DestGDIColor: TGDIColor); begin SetGDIColorRef(DestGDIColor,SourceGDIColor.ColorRef); @@ -3196,6 +3202,9 @@ var MainStyle: PGtkStyle; begin if Widget=nil then exit; + {$IFDEF NoStyle} + exit; + {$ENDIF} gtk_widget_set_rc_style(Widget); MainStyle:=gtk_widget_get_style(Widget); if MainStyle=nil then exit; @@ -3629,12 +3638,18 @@ var NoName: PGChar; begin Result := nil; + {$IFDEF NoStyle} + exit; + {$ENDIF} If Not Assigned(Styles) then exit; l:=IndexOfStyle(WName); + //writeln('GetStyle A ',WName,' ',l); If l < 0 then begin + // create a new style object StyleObject := NewStyleObject; Tp:=nil; + // create a style widget If AnsiCompareText(WName,'button')=0 then StyleObject^.Widget := GTK_BUTTON_NEW else @@ -3646,8 +3661,9 @@ begin NoName,[]); end else - If AnsiCompareText(WName,'window')=0 then - StyleObject^.Widget := GTK_WINDOW_NEW(0) + If AnsiCompareText(WName,'window')=0 then begin + StyleObject^.Widget := GTK_WINDOW_NEW(0); + end else If AnsiCompareText(WName,'checkbox')=0 then begin StyleObject^.Widget := GTK_CHECK_BUTTON_NEW; @@ -3681,6 +3697,7 @@ begin FreeStyleObject(StyleObject); exit; end; + // ensure style of the widget If (StyleObject^.Widget <> nil) then begin gtk_widget_ensure_style(StyleObject^.Widget); StyleObject^.Style:=GTK_RC_GET_STYLE(StyleObject^.Widget); @@ -3688,15 +3705,17 @@ begin If StyleObject^.Style <> nil then If AnsiCompareText(WName,'gtk_default')<>0 then StyleObject^.Style:=GTK_Style_Ref(StyleObject^.Style); + // if successful add to style objects list if StyleObject^.Style <> nil then begin Styles.AddObject(WName, TObject(StyleObject)); Result:=StyleObject^.Style; If StyleObject^.Widget <> nil then UpdateSysColorMap(StyleObject^.Widget); end - else - If AnsiCompareText(WName,'default')<>0 then - Result := GetStyle('default'); + else begin + // no success, clean up + FreeStyleObject(StyleObject); + end; If Tp<>nil then GTK_Object_Destroy(Tp); end else @@ -3746,10 +3765,12 @@ begin {$ELSE} Result := Style^.Font; If Result = nil then + {$IFNDEF NoStyle} If (Style^.RC_Style <> nil) then begin if (Style^.RC_Style^.font_name <> nil) then Result := gdk_font_load(Style^.RC_Style^.font_name); end; + {$ENDIF} {$ENDIF} end; @@ -3764,24 +3785,33 @@ end; Function GetSysGCValues(Color : TColorRef) : TGDKGCValues; var - Style : PGTKStyle; - GC : PGDKGC; - Pixmap : PGDKPixmap; - SysColor : TColorRef; + Style: PGTKStyle; + GC: PGDKGC; + Pixmap: PGDKPixmap; + SysColor: TColorRef; + BaseColor: TColorRef; begin - Color := Color and $FF; + BaseColor := Color and $FF; {Set defaults in case something goes wrong} FillChar(Result, SizeOf(Result), 0); - SysColor := GetSysColor(Color); + Style:=nil; + GC:=nil; + Pixmap:=nil; + + SysColor := GetSysColor(BaseColor); + Result.Fill := GDK_Solid; Result.foreground.Red := RGB(0,GetRValue(SysColor),0); Result.foreground.Green := RGB(0,GetGValue(SysColor),0); Result.foreground.Blue := RGB(0,GetBValue(SysColor),0); - Result.Fill := GDK_Solid; + + {$IFDEF NoStyle} + exit; + {$ENDIF} {$IfDef Disable_GC_SysColors} - exit; + exit; {$EndIf} - Case Color of + Case BaseColor of {These are WM/X defined, but might be possible to get} {COLOR_BACKGROUND @@ -3813,7 +3843,8 @@ begin GC := Style^.bg_gc[GTK_STATE_NORMAL]; If GC = nil then begin Result.Fill := GDK_Solid; - Result.foreground := Style^.bg[GTK_STATE_PRELIGHT]; + if Style^.bg[GTK_STATE_PRELIGHT].Pixel<>0 then + Result.foreground := Style^.bg[GTK_STATE_PRELIGHT]; end else GDK_GC_Get_Values(GC, @Result); @@ -3830,7 +3861,8 @@ begin GC := Style^.fg_gc[GTK_STATE_NORMAL]; If GC = nil then begin Result.Fill := GDK_Solid; - Result.foreground := Style^.fg[GTK_STATE_NORMAL]; + if Style^.fg[GTK_STATE_NORMAL].Pixel<>0 then + Result.foreground := Style^.fg[GTK_STATE_NORMAL]; end else GDK_GC_Get_Values(GC, @Result); @@ -3840,15 +3872,13 @@ begin COLOR_SCROLLBAR, COLOR_BTNFACE : begin - Case Color of - COLOR_BTNFACE : Style := GetStyle('window'); - COLOR_MENU : Style := GetStyle('menu'); - COLOR_SCROLLBAR : Style := GetStyle('scrollbar'); + Case BaseColor of + COLOR_BTNFACE: Style := GetStyle('window'); + COLOR_MENU: Style := GetStyle('menu'); + COLOR_SCROLLBAR: Style := GetStyle('scrollbar'); end; - If Style = nil then exit; - Pixmap := Style^.bg_pixmap[GTK_STATE_NORMAL]; If Pixmap <> nil then begin Result.Fill := GDK_Tiled; @@ -3857,7 +3887,8 @@ begin GC := Style^.bg_gc[GTK_STATE_NORMAL]; If GC = nil then begin Result.Fill := GDK_Solid; - Result.foreground := Style^.fg[GTK_STATE_NORMAL]; + if Style^.fg[GTK_STATE_NORMAL].Pixel<>0 then + Result.foreground := Style^.fg[GTK_STATE_NORMAL]; end else GDK_GC_Get_Values(GC, @Result); @@ -3873,7 +3904,8 @@ begin GC := Style^.dark_gc[GTK_STATE_NORMAL]; If GC = nil then begin Result.Fill := GDK_Solid; - Result.foreground := Style^.dark[GTK_STATE_NORMAL]; + if Style^.dark[GTK_STATE_NORMAL].Pixel<>0 then + Result.foreground := Style^.dark[GTK_STATE_NORMAL]; end else GDK_GC_Get_Values(GC, @Result); @@ -3885,14 +3917,19 @@ begin If Style = nil then exit; GC := Style^.text_gc[GTK_STATE_INSENSITIVE]; - GDK_GC_Get_Values(GC, @Result); + if GC=nil then begin + Result.Fill := GDK_Solid; + if Style^.text[GTK_STATE_NORMAL].Pixel<>0 then + Result.foreground := Style^.text[GTK_STATE_NORMAL]; + end else + GDK_GC_Get_Values(GC, @Result); end; COLOR_MENUTEXT, COLOR_WINDOWTEXT, COLOR_BTNTEXT : begin - Case Color of + Case BaseColor of COLOR_BTNTEXT : Style := GetStyle('button'); COLOR_MENUTEXT : Style := GetStyle('menuitem'); COLOR_WINDOWTEXT : Style := GetStyle('default'); @@ -3902,7 +3939,8 @@ begin GC := Style^.text_gc[GTK_STATE_NORMAL]; If GC = nil then begin Result.Fill := GDK_Solid; - Result.foreground := Style^.text[GTK_STATE_NORMAL]; + if Style^.text[GTK_STATE_NORMAL].Pixel<>0 then + Result.foreground := Style^.text[GTK_STATE_NORMAL]; end else GDK_GC_Get_Values(GC, @Result); @@ -3917,7 +3955,8 @@ begin GC := Style^.light_gc[GTK_STATE_NORMAL]; If GC = nil then begin Result.Fill := GDK_Solid; - Result.foreground := Style^.light[GTK_STATE_NORMAL]; + if Style^.light[GTK_STATE_NORMAL].Pixel<>0 then + Result.foreground := Style^.light[GTK_STATE_NORMAL]; end else GDK_GC_Get_Values(GC, @Result); @@ -3931,7 +3970,8 @@ begin GC := Style^.base_gc[GTK_STATE_NORMAL]; If GC = nil then begin Result.Fill := GDK_Solid; - Result.foreground := Style^.base[GTK_STATE_NORMAL]; + if Style^.base[GTK_STATE_NORMAL].Pixel<>0 then + Result.foreground := Style^.base[GTK_STATE_NORMAL]; end else GDK_GC_Get_Values(GC, @Result); @@ -3945,7 +3985,8 @@ begin GC := Style^.bg_gc[GTK_STATE_SELECTED]; If GC = nil then begin Result.Fill := GDK_Solid; - Result.foreground := Style^.bg[GTK_STATE_SELECTED]; + if Style^.bg[GTK_STATE_SELECTED].Pixel<>0 then + Result.foreground := Style^.bg[GTK_STATE_SELECTED]; end else GDK_GC_Get_Values(GC, @Result); @@ -3959,7 +4000,8 @@ begin GC := Style^.bg_gc[GTK_STATE_PRELIGHT]; If GC = nil then begin Result.Fill := GDK_Solid; - Result.foreground := Style^.bg[GTK_STATE_PRELIGHT]; + if Style^.bg[GTK_STATE_PRELIGHT].Pixel<>0 then + Result.foreground := Style^.bg[GTK_STATE_PRELIGHT]; end else GDK_GC_Get_Values(GC, @Result); @@ -4363,6 +4405,9 @@ end; { ============================================================================= $Log$ + Revision 1.192 2003/08/30 18:53:08 mattias + using default colors, when theme does not define them + Revision 1.191 2003/08/29 21:21:07 mattias fixes for gtk2 diff --git a/lcl/interfaces/gtk/gtkproc.pp b/lcl/interfaces/gtk/gtkproc.pp index c0ee6356da..4739a75fe3 100644 --- a/lcl/interfaces/gtk/gtkproc.pp +++ b/lcl/interfaces/gtk/gtkproc.pp @@ -484,6 +484,9 @@ procedure Set_RC_Name(Sender : TObject; AWidget: PGtkWidget); var RCName: string; AComponent: TComponent; begin + {$IFDEF NoStyle} + exit; + {$ENDIF} if (AWidget=nil) or (not (Sender is TComponent)) then exit; // check if a unique name can be created diff --git a/lcl/interfaces/gtk/gtkwinapiwindow.pp b/lcl/interfaces/gtk/gtkwinapiwindow.pp index b43ab600cc..6dc78773b9 100644 --- a/lcl/interfaces/gtk/gtkwinapiwindow.pp +++ b/lcl/interfaces/gtk/gtkwinapiwindow.pp @@ -382,7 +382,9 @@ begin ShowHideOnFocus := true; end; + {$IFNDEF NoStyle} gtk_widget_set_app_paintable(PGTKWidget(Client),true); + {$ENDIF} end; function GTKAPIWidgetClient_GetType: Guint; @@ -924,6 +926,9 @@ end. { ============================================================================= $Log$ + Revision 1.47 2003/08/30 18:53:08 mattias + using default colors, when theme does not define them + Revision 1.46 2003/05/26 21:28:22 mattias fixed absolute file