diff --git a/art/print.xpm b/art/print.xpm index 23107e50b9..a090f99931 100644 --- a/art/print.xpm +++ b/art/print.xpm @@ -1,57 +1,60 @@ /* XPM */ static char *print_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 36 1", -"u c #EDF2FB", -"0 c #4E7FD0", -", c #B9CDED", -"$ c #3365B7", -"t c #FFFFFF", -"9 c #2C58A0", -"X c #779DDB", -"8 c #7FA2DD", -"y c #3263B4", -"w c #6E96D8", -"- c #6992D7", -"= c #D9E4F5", -"q c #356AC1", -"@ c #ADC4E9", -"* c #CBD9F1", -": c #97B4E3", -"r c #3161B1", +"16 15 39 1", +"< c #E3E4E6", +"+ c #C3C3C4", +"i c #FFFFFF", +": c #74879B", +"# c #5A89A6", +"a c #F1F4F7", +"r c #5A809C", +"@ c #BDCCD9", +"e c #7A92A4", +"% c #3F6F93", +"t c #9FA2A6", +"3 c #939495", +"w c #5F666D", +"9 c #65839E", +"5 c #4A7291", +"$ c #4B7F9E", " c None", -"2 c #B5C9EB", -"< c #7CA0DC", -"5 c #487BCE", -"; c #4377CD", -". c #5584D1", -"7 c #3A70CA", -"3 c #305FAC", -"1 c #5685D2", -"e c #4075CC", -"6 c #638ED5", -"4 c #3467BC", -"& c #2F5DA9", -"o c #ECF1FA", -"> c #D6E1F4", -"# c #376EC9", -"% c #2D5AA5", -"+ c #A2BCE6", -"O c #CFDDF3", +"O c #DFE0E2", +"o c #F3F3F3", +"; c #84A5BB", +"& c #467291", +". c #7897AD", +"* c #407598", +"4 c #CFCFD0", +"7 c #6F90A6", +"y c #6A89A2", +"0 c #AAADB2", +"1 c #D2D3D4", +"u c #4F7592", +", c #BCBDBE", +"p c #57778E", +"q c #979BA0", +"2 c #ABABAC", +"- c #E7E7E7", +"= c #D6DEE6", +"> c #9FA0A0", +"8 c #829EB5", +"X c #8FB0C3", +"6 c #5D7C93", /* pixels */ -" .XXXXXXXX ", -" .oooooooX ", -" .OOOOOOOX ", -" .+++++++X ", -" @##$%&&&&&%&##@", -" $*=-;-:>,<1$=*$", -" .22.3456.74$22.", -" 5:::::::::::::5", -" 788699999990887", -" qww7qeeeeeerwwq", -" 4664ttttttt%664", -" 411yutttttt%114", -" XXX&ttttttt%XXX", -" 4ttttttt% ", -" $XXXXXXX# " +" .XXXXXXXX ", +" .oooooooX ", +" .OOOOOOOX ", +" .+++++++X ", +"@##$%&&&&&%*##@ ", +"$=-;:>,<123$-=$ ", +".44.5678.96$44. ", +"7,,,,,,,,,,,,,7 ", +"900qwwwwwwwe009 ", +"rtt9ryyyyyyuttr ", +"6qq6iiiiiii%qq6 ", +"633paiiiiii%336 ", +"XXX*iiiiiii%XXX ", +" 6iiiiiii% ", +" $XXXXXXX# " }; diff --git a/contrib/samples/fl/bitmaps/copy.bmp b/contrib/samples/fl/bitmaps/copy.bmp index 5e66fc8dfe..a21608fc23 100644 Binary files a/contrib/samples/fl/bitmaps/copy.bmp and b/contrib/samples/fl/bitmaps/copy.bmp differ diff --git a/contrib/samples/fl/bitmaps/cut.bmp b/contrib/samples/fl/bitmaps/cut.bmp index cf9247f2ea..d41668ab3f 100644 Binary files a/contrib/samples/fl/bitmaps/cut.bmp and b/contrib/samples/fl/bitmaps/cut.bmp differ diff --git a/contrib/samples/fl/bitmaps/file_icon.bmp b/contrib/samples/fl/bitmaps/file_icon.bmp index cb3414c146..496988c6de 100644 Binary files a/contrib/samples/fl/bitmaps/file_icon.bmp and b/contrib/samples/fl/bitmaps/file_icon.bmp differ diff --git a/contrib/samples/fl/bitmaps/folder_icon.bmp b/contrib/samples/fl/bitmaps/folder_icon.bmp index 7e45f597ec..feae18738a 100644 Binary files a/contrib/samples/fl/bitmaps/folder_icon.bmp and b/contrib/samples/fl/bitmaps/folder_icon.bmp differ diff --git a/contrib/samples/fl/bitmaps/open.bmp b/contrib/samples/fl/bitmaps/open.bmp index 8a2ac5cc01..35ad487487 100644 Binary files a/contrib/samples/fl/bitmaps/open.bmp and b/contrib/samples/fl/bitmaps/open.bmp differ diff --git a/contrib/samples/fl/bitmaps/paste.bmp b/contrib/samples/fl/bitmaps/paste.bmp index 8c4b66bfe8..73032d58b0 100644 Binary files a/contrib/samples/fl/bitmaps/paste.bmp and b/contrib/samples/fl/bitmaps/paste.bmp differ diff --git a/contrib/samples/fl/bitmaps/save.bmp b/contrib/samples/fl/bitmaps/save.bmp index 02f8c7d5cb..2da2da72ad 100644 Binary files a/contrib/samples/fl/bitmaps/save.bmp and b/contrib/samples/fl/bitmaps/save.bmp differ diff --git a/contrib/samples/fl/bitmaps/saveall.bmp b/contrib/samples/fl/bitmaps/saveall.bmp index bd04e1c10f..4413bcfe74 100644 Binary files a/contrib/samples/fl/bitmaps/saveall.bmp and b/contrib/samples/fl/bitmaps/saveall.bmp differ diff --git a/contrib/samples/ogl/studio/bitmaps/copy.bmp b/contrib/samples/ogl/studio/bitmaps/copy.bmp deleted file mode 100644 index 4551a06bfa..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/copy.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/copy.xpm b/contrib/samples/ogl/studio/bitmaps/copy.xpm index 47565c1cae..00ae82e213 100644 --- a/contrib/samples/ogl/studio/bitmaps/copy.xpm +++ b/contrib/samples/ogl/studio/bitmaps/copy.xpm @@ -1,25 +1,44 @@ /* XPM */ static char *copy_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 4 1", +"16 15 23 1", +"+ c #769CDA", +": c #DCE6F6", +"X c #3365B7", +"* c #FFFFFF", +"o c #9AB6E4", +"< c #EAF0FA", +"# c #B1C7EB", +". c #6992D7", +"3 c #F7F9FD", +", c #F0F5FC", +"$ c #A8C0E8", " c None", -". c Black", -"X c Gray100", -"o c #000080", +"- c #FDFEFF", +"& c #C4D5F0", +"1 c #E2EAF8", +"O c #89A9DF", +"= c #D2DFF4", +"4 c #FAFCFE", +"2 c #F5F8FD", +"; c #DFE8F7", +"% c #B8CCEC", +"> c #E5EDF9", +"@ c #648FD6", /* pixels */ -" ", -" ...... ", -" .XXXX.. ", -" .XXXX.X. ", -" .X..X.oooooo ", -" .XXXXXoXXXXoo ", -" .X....oXXXXoXo ", -" .XXXXXoX..Xoooo", -" .X....oXXXXXXXo", -" .XXXXXoX.....Xo", -" ......oXXXXXXXo", -" oX.....Xo", -" oXXXXXXXo", -" ooooooooo", -" " +" .....XX ", +" .oO+@X#X ", +" .$oO+X##X ", +" .%$o........ ", +" .&%$.*=&#o.-. ", +" .=&%.*;=&#.--. ", +" .:=&.*>;=&.... ", +" .>:=.*,>;=&#o. ", +" .<1:.*2,>:=&#. ", +" .2<1.*32,>:=&. ", +" .32<.*432,>:=. ", +" .32<.*-432,>:. ", +" .....**-432,>. ", +" .***-432,. ", +" .......... " }; diff --git a/contrib/samples/ogl/studio/bitmaps/cut.bmp b/contrib/samples/ogl/studio/bitmaps/cut.bmp deleted file mode 100644 index 15554338a0..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/cut.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/cut.xpm b/contrib/samples/ogl/studio/bitmaps/cut.xpm index bfe7e95cea..8afa8f6d15 100644 --- a/contrib/samples/ogl/studio/bitmaps/cut.xpm +++ b/contrib/samples/ogl/studio/bitmaps/cut.xpm @@ -1,24 +1,46 @@ /* XPM */ static char *cut_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 3 1", +"16 15 25 1", +"6 c #D8BDC0", +": c #C3C3C4", +"- c #FFFFFF", +". c #6C6D70", +"2 c #AD3A45", +"o c #DBDBDB", +"# c #939495", +"< c #E42234", +"& c #C3C5C8", +"; c #C6CCD3", +"% c #B7B7B8", " c None", -". c Black", -"X c #000080", +"* c #DFE0E2", +"5 c #B69596", +"3 c #9C2A35", +"1 c #CFCFD0", +", c #AB5C64", +"+ c #D2D3D4", +"$ c #BCBDBE", +"@ c #C6C8CA", +"> c #CDC0C1", +"O c #826F72", +"X c #979BA0", +"4 c #9B8687", +"= c #9FA0A0", /* pixels */ -" ", -" . . ", -" . . ", -" . . ", -" .. .. ", -" . . ", -" ... ", -" . ", -" X.X ", -" X XXX ", -" XXX X X ", -" X X X X ", -" X X X X ", -" X X XX ", -" XX " +" .X .o ", +" O.+ @. ", +" O. .. ", +" O#$ %.& ", +" O.*.. ", +" #%#.. ", +" O=-.. ", +" #%#;. ", +" OO:=O ", +" >,,<, ,<,,1 ", +" ><23<1 1<32<1 ", +" ,2 4< <5 2, ", +" <, ,2 2, ,< ", +" 23,<5 5<,32 ", +" 6225 522> " }; diff --git a/contrib/samples/ogl/studio/bitmaps/file1.ico b/contrib/samples/ogl/studio/bitmaps/file1.ico index cc828ab4f2..497f7321bf 100644 Binary files a/contrib/samples/ogl/studio/bitmaps/file1.ico and b/contrib/samples/ogl/studio/bitmaps/file1.ico differ diff --git a/contrib/samples/ogl/studio/bitmaps/folder1.ico b/contrib/samples/ogl/studio/bitmaps/folder1.ico index c43de1c07c..806b900a30 100644 Binary files a/contrib/samples/ogl/studio/bitmaps/folder1.ico and b/contrib/samples/ogl/studio/bitmaps/folder1.ico differ diff --git a/contrib/samples/ogl/studio/bitmaps/help.bmp b/contrib/samples/ogl/studio/bitmaps/help.bmp deleted file mode 100644 index 2d9e6922ca..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/help.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/help.xpm b/contrib/samples/ogl/studio/bitmaps/help.xpm index 27a87ebb31..161b6b2658 100644 --- a/contrib/samples/ogl/studio/bitmaps/help.xpm +++ b/contrib/samples/ogl/studio/bitmaps/help.xpm @@ -1,24 +1,71 @@ /* XPM */ static char *help_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 3 1", +"16 15 50 1", +"j c #4E7FD0", +"8 c #EDF2FB", +", c #7198D9", +"e c #DCE6F6", +"y c #FFFFFF", +"5 c #95B2E3", +"$ c #9AB6E4", +"g c #EAF0FA", +"1 c #2D59A3", +"@ c #B1C7EB", +"> c #6992D7", +"a c #D9E4F5", +"r c #356AC1", +"6 c #9BB7E5", +"= c #F7F9FD", +"+ c #BED0EE", +"z c #F0F5FC", +"f c #ADC4E9", +"# c #A8C0E8", +"7 c #CBD9F1", +"u c #366BC2", " c None", -". c Black", -"X c #008080", +"c c #FDFEFF", +"w c #274D8D", +"t c #C4D5F0", +"% c #7CA0DC", +"h c #E2EAF8", +"p c #487BCE", +"o c #4377CD", +"4 c #2A549A", +"< c #254A87", +"O c #CCDAF2", +"& c #89A9DF", +"9 c #2B559B", +"* c #D2DFF4", +". c #3366BB", +": c #2E5CA8", +"x c #FAFCFE", +"l c #F5F8FD", +"2 c #799EDB", +"d c #DFE8F7", +"; c #A6BFE8", +"3 c #638ED5", +"- c #5282D0", +"X c #2A5398", +"0 c #B8CCEC", +"s c #376EC9", +"q c #2D5AA5", +"i c #285092", +"k c #8CACE0", /* pixels */ -" ", -" ...... ", -" .XXXXX.. ", -" .XX...XX.. ", -" .X.. .X.. ", -" .X.. .XX.. ", -" .. .XX.. ", -" .XX.. ", -" .X.. ", -" .X.. ", -" .X.. ", -" .. ", -" .XX.. ", -" .XX.. ", -" ... " +" .......Xo ", +" .O+@#$%.&o ", +" .*O+@#$.=&- ", +" ;:::>#@#.==&: ", +" ,<1234<>@....: ", +"5 c #3366BB", +"$ c #2E5CA8", +"9 c #FAFCFE", +"4 c #F5F8FD", +"q c #638ED5", +"o c #5282D0", +"& c #B8CCEC", +"X c #376EC9", +"< c #ACE95B", /* pixels */ -" ", -" ........ ", -" .XXXXXX.. ", -" .XXXXXX.X. ", -" .XXXXXX.... ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" ........... ", -" " +" .XoO+@#$. ", +" .%%&*=-O;: ", +" >>>>%&*=O,=o ", +" ><<>%%&*O,,=o", +">>><<>>>%&OOo+@", +"><<<<<<>1%&*=-@", +"><<<<<<>21%&*=@", +">>><<>>>321%&*+", +" ><<>456321%&O", +" >>>>7456321%o", +" .,8974563210", +" .,,897456320", +" .,,,8974563q", +" .,,,,897456w", +" ............" }; diff --git a/contrib/samples/ogl/studio/bitmaps/open.bmp b/contrib/samples/ogl/studio/bitmaps/open.bmp deleted file mode 100644 index bbf93fe033..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/open.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/open.xpm b/contrib/samples/ogl/studio/bitmaps/open.xpm index 54748e910d..36e058fc8e 100644 --- a/contrib/samples/ogl/studio/bitmaps/open.xpm +++ b/contrib/samples/ogl/studio/bitmaps/open.xpm @@ -1,26 +1,57 @@ /* XPM */ static char *open_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 5 1", +"16 15 36 1", +", c #AAC1E8", +"1 c #9AEA53", +"q c #DCE6F6", +". c #295193", +"; c #A9D066", +"r c #C6D6F0", +"$ c #4A7CCE", +"9 c #779DDB", +"8 c #EAF0FA", +"O c #6E96D8", +"X c #214279", +"e c #BED0EE", +"6 c #85A7DF", +"5 c #F0F5FC", +"t c #ADC4E9", +": c #3161B1", " c None", -". c Black", -"X c Yellow", -"o c Gray100", -"O c #bfbf00", +"u c #274D8B", +"& c #BFDC9B", +"> c #9FB9E5", +"y c #5584D1", +"w c #3569BF", +"% c #3A70CA", +"+ c #305FAC", +"3 c #5D89D3", +"0 c #D2DFF4", +"@ c #CAE2AA", +"= c #B2D58C", +"2 c #FAFCFE", +"# c #638ED5", +"* c #CEDCF2", +"4 c #90AFE2", +"< c #B3C8EB", +"7 c #E5EDF9", +"- c #A2BCE6", +"o c #DFF0D0", /* pixels */ " ", -" ... ", -" . . .", -" ..", -" ... ...", -" .XoX....... ", -" .oXoXoXoXo. ", -" .XoXoXoXoX. ", -" .oXoX..........", -" .XoX.OOOOOOOOO.", -" .oo.OOOOOOOOO. ", -" .X.OOOOOOOOO. ", -" ..OOOOOOOOO. ", -" ........... ", +" .... ", +"XXXXX .oo. ", +"XOOOO+ .@o. ", +"XOOOO#$%.&*XXX ", +"XOOOOOOO.=*X-X ", +"XOXXXX...;*XXXX:", +"XOX>,<.11111*X2:", +"X3X4>,<.111*X5-:", +"XX#64>,,.1*X78: ", +"XXO964>,,.X0q7: ", +"Xw3O964>,,er0t: ", +"X%y3O964>, c #FEE3D7", +"O c #FFFFFF", +"o c #7B767D", +"% c #F79586", +"& c #CAE1F3", +"@ c #F08B62", +"# c #FCCBB8", +"- c #FDD8C9", +"4 c #FFF8F4", +"5 c #FFF5F0", " c None", -". c Black", -"X c Yellow", -"o c #808080", -"O c #000080", -"+ c Gray100", +"$ c #F8AA8F", +", c #EFF6FC", +"1 c #F7FBFD", +"2 c #FAFCFE", +"; c #DAEAF7", +": c #E9F3FA", +"6 c #FFFAF8", +". c #3C78A6", +"3 c #FFF1ED", +"X c #9B8687", +"+ c #FBBCA4", +"* c #B6D5EE", +"= c #F4F9FD", /* pixels */ -" ", -" .... ", -" .....XX..... ", -".ooo.X..X.ooo. ", -".oo. .oo. ", -".oo........oo. ", -".oooooooooooo. ", -".oooooOOOOOOO. ", -".oooooO+++++OO ", -".oooooO+++++O+O ", -".oooooO+OOO+OOO ", -".oooooO+++++++O ", -".oooooO+OOOOO+O ", -" .....O+++++++O ", -" OOOOOOOOO " +" ...... ", +" .XoOOOOoo. ", +".+XOOOOOOX@. ", +".+XXXXXXXX@. ", +".#++$$%@..... ", +".##++$$%.&*.=. ", +".-##++$$.;&.==. ", +".--##++$.:;.... ", +".>--##++.,:;&*. ", +".<>--##+.1,:;&. ", +".<<>--##.21,:;. ", +".3<<>--#.O21=:. ", +".45<<>--....... ", +".6453<>----. ", +"............ " }; diff --git a/contrib/samples/ogl/studio/bitmaps/preview.xpm b/contrib/samples/ogl/studio/bitmaps/preview.xpm index 0dfdca46e1..d0176b3546 100644 --- a/contrib/samples/ogl/studio/bitmaps/preview.xpm +++ b/contrib/samples/ogl/studio/bitmaps/preview.xpm @@ -1,26 +1,51 @@ /* XPM */ static char *preview_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 5 1", -" c Black", -". c None", -"X c Gray100", -"o c #808080", -"O c Cyan", +"16 15 30 1", +"1 c Black", +"= c #97C4E7", +"< c #FFFFFF", +", c #69A1CF", +". c #5A89A6", +"# c #3A749C", +"+ c #538BB1", +"> c #D1E5F5", +"o c #6792AE", +"% c #C3DDF1", +"8 c #749BB5", +"; c #619BC4", +"X c #6B97B6", +"@ c #4B82A8", +" c None", +"O c #5F8FB0", +"q c #84A5BB", +": c #71A8D1", +"- c #85BBE2", +"9 c #EFF6FC", +"7 c #F7FBFD", +"6 c #FAFCFE", +"2 c #7FA6C0", +"5 c #C00000", +"0 c #FDFDFE", +"3 c #E2EFF8", +"$ c #8EA9BC", +"& c #B6D5EE", +"* c #A5CCEA", +"4 c #F4F9FD", /* pixels */ -" .......", -" XXXXXXX ......", -" XXXXXXX . .....", -" XXXXXXX ....", -" XXXXXXXXXX ....", -" XXXXXXX ....", -" XXXXXX o..o ...", -" XXXXX oOO.oo ..", -" XXXXX .O..o. ..", -" XXXXX ....o. ..", -" XXXXX o..Ooo ..", -" XXXXXX o..o o..", -" XXXXXXX o .", -" XXXXXXXXXX . ", -" .. " +" ..XoO+@#$ ", +" .%%&*=-;:; ", +" .>>%&*=,<=X ", +" $%%%1112<<=X ", +" $3-1<<<1oXO+ ", +" $314<<<<1=-+ ", +" $31<<<<<1-=+ ", +" $31<<<<<1&*O ", +" $3-1<<<51>%X ", +" $367111551>8 ", +" $3-----95518 ", +" $3<067466551 ", +" $3--------551 ", +" $3<<<0666<<55 ", +" $$$$$$$$$$q$ " }; diff --git a/contrib/samples/ogl/studio/bitmaps/print.bmp b/contrib/samples/ogl/studio/bitmaps/print.bmp deleted file mode 100644 index 00319b55bb..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/print.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/print.xpm b/contrib/samples/ogl/studio/bitmaps/print.xpm index 3c2e2be781..fae8103a9a 100644 --- a/contrib/samples/ogl/studio/bitmaps/print.xpm +++ b/contrib/samples/ogl/studio/bitmaps/print.xpm @@ -1,26 +1,56 @@ /* XPM */ static char *print_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 5 1", +"16 15 35 1", +"y c #EDF2FB", +"9 c #4E7FD0", +"> c #B9CDED", +"# c #3365B7", +"r c #FFFFFF", +"8 c #2C58A0", +"X c #779DDB", +"7 c #7FA2DD", +"t c #3263B4", +"q c #6E96D8", +"= c #6992D7", +"* c #D9E4F5", +"0 c #356AC1", +"& c #CBD9F1", +"; c #97B4E3", +"e c #3161B1", " c None", -". c Black", -"X c Gray100", -"o c #808000", -"O c Yellow", +"1 c #B5C9EB", +", c #7CA0DC", +"4 c #487BCE", +"- c #4377CD", +". c #5584D1", +"6 c #3A70CA", +"2 c #305FAC", +"< c #5685D2", +"w c #4075CC", +"5 c #638ED5", +"3 c #3467BC", +"% c #2F5DA9", +"o c #ECF1FA", +": c #D6E1F4", +"@ c #376EC9", +"$ c #2D5AA5", +"+ c #A2BCE6", +"O c #CFDDF3", /* pixels */ -" ", -" ......... ", -" .XXXXXXXX. ", -" .X.....X. ", -" .XXXXXXXX. ", -" .X.....X.... ", -" .XXXXXXXX. . .", -" .......... . ..", -". . . .", -"............. .", -". ooo . . ", -". OOO ... ", -"............. . ", -" . . . ", -" ........... " +" .XXXXXXXX ", +" .oooooooX ", +" .OOOOOOOX ", +" .+++++++X ", +" @@#$%%%%%$%@@ ", +"#&*=-=;:>,<#*&# ", +".11.2345.63#11. ", +"4;;;;;;;;;;;;;4 ", +"677588888889776 ", +"0qq60wwwwwweqq0 ", +"3553rrrrrrr$553 ", +"3< c #3A70CA", +"- c #3569BF", +"& c #305FAC", +"1 c #5D89D3", +"= c #3366B9", +"9 c #2E5CA8", +"< c #638ED5", +"4 c #3467BC", +"X c #2F5DA9", +"# c #2A5398", +"$ c #376EC9", +"* c #2D5AA5", +"; c #8CACE0", /* pixels */ -"################", -"################", -"################", -"################", -"###a....########", -"##a.####..###.##", -"##.#######.#..##", -"##.########...##", -"##.#######....##", -"##a.#####.....##", -"###.a###########", -"################", -"################", -"################", -"################" +" .XoooO+ ", +" @o#####o$ @ ", +"%#&&*#*&&*# @o ", +"X=-#@;@#=-:#$*# ", +"#>-@ #->-=># ", +"*,>% #>,,,# ", +"*<1X X,<<<* ", +"@234; #13333* ", +" X56X $#7O155X ", +" O2869 .0$*o ", +" :qwe9 ", +" 9.rt9 ", +" 9+y@u ", +" i$$ ", +" " }; diff --git a/contrib/samples/ogl/studio/bitmaps/save.bmp b/contrib/samples/ogl/studio/bitmaps/save.bmp deleted file mode 100644 index 56dd10b6e3..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/save.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/save.xpm b/contrib/samples/ogl/studio/bitmaps/save.xpm index 01b18f9340..accf1f9eb2 100644 --- a/contrib/samples/ogl/studio/bitmaps/save.xpm +++ b/contrib/samples/ogl/studio/bitmaps/save.xpm @@ -1,25 +1,42 @@ /* XPM */ static char *save_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 4 1", -" c None", -". c Black", -"X c #808000", -"o c #808080", +"16 15 21 1", +": c #AAC1E8", +"1 c #B9CDED", +"O c #FFFFFF", +" c #2C58A0", +"* c #B0C6EA", +"; c #2D59A3", +"X c #1C3866", +"= c #C3D4EF", +"2 c #CBD9F1", +"- c #DAE5F6", +"# c #97B4E3", +". c None", +"$ c #274D8B", +"& c #9FB9E5", +"@ c #5584D1", +"% c #82A5DE", +"o c #3A70CA", +"< c #A5BEE7", +", c #D2DFF4", +"+ c #3467BC", +"> c #C0D1EE", /* pixels */ -" ", -" .............. ", -" .X. . . ", -" .X. ... ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .XX........oX. ", -" .XXXXXXXXXXXX. ", -" .XX.........X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" ............. " +" .", +" XoOOOOOOOOO+X .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @@+++++++++@@ .", +" @@@@@@@@@@@@@ .", +" @@@$$$$$$$$@@ .", +" @@$%%%&*=-O$@ .", +" @@$%X;;*=-O$@ .", +" @@$%X;;:>,O$@ .", +" @@$%X;;<12O$@ .", +" @@$<<2OOOOO$@ .", +". .." }; diff --git a/contrib/samples/ogl/studio/bitmaps/undo.bmp b/contrib/samples/ogl/studio/bitmaps/undo.bmp deleted file mode 100644 index 4ad80c772f..0000000000 Binary files a/contrib/samples/ogl/studio/bitmaps/undo.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/bitmaps/undo.xpm b/contrib/samples/ogl/studio/bitmaps/undo.xpm index 157a623e3c..9266cb0e12 100644 --- a/contrib/samples/ogl/studio/bitmaps/undo.xpm +++ b/contrib/samples/ogl/studio/bitmaps/undo.xpm @@ -1,25 +1,58 @@ /* XPM */ static char *undo_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 16 15 3 1", -/* colors */ -". c #000080", -"# c #c0c0c0", -"a c #808080", +/* columns rows colors chars-per-pixel */ +"16 15 37 1", +"4 c #4E7FD0", +"i c #3365B7", +"q c #8DADE1", +"= c #3162B3", +", c #4A7CCE", +"* c #779DDB", +"7 c #7FA2DD", +"8 c #6992D7", +"2 c #6E96D8", +"6 c #356AC1", +"+ c #9BB7E5", +"@ c #5886D2", +"y c #BED0EE", +"t c #C3D4EF", +"5 c #85A7DF", +". c #ADC4E9", +"u c #DAE5F6", +" c None", +"X c #487BCE", +"r c #9FB9E5", +"o c #254A87", +"w c #AEC5EA", +"e c #89A9DF", +"0 c #98B5E4", +"> c #3A70CA", +"- c #3569BF", +"& c #305FAC", +"1 c #5D89D3", +"; c #3366B9", +"9 c #2E5CA8", +"< c #638ED5", +"3 c #3467BC", +"O c #2F5DA9", +"$ c #2A5398", +"# c #376EC9", +"% c #2D5AA5", +": c #8CACE0", /* pixels */ -"################", -"################", -"################", -"################", -"########....a###", -"##.###..####.a##", -"##..#.#######.##", -"##...########.##", -"##....#######.##", -"##.....#####.a##", -"###########a.###", -"################", -"################", -"################", -"################" +" .XoooO+ ", +"@ #o$$$$$o@ ", +"o@ $%&&%$%&&$* ", +"$%#$=-;$@:@$-;O ", +"$>;->-$ @->$ ", +"$,,,>$ *>,% ", +"%<<<,O O1<% ", +"%22221$ :324@ ", +"O551X6$# O75O ", +"o%#8+ 9704X ", +" 9qwe= ", +" 9rt+9 ", +" y@u.9 ", +" ##i ", +" " }; diff --git a/contrib/samples/ogl/studio/manual/bitmap1.bmp b/contrib/samples/ogl/studio/manual/bitmap1.bmp deleted file mode 100644 index 13e2170b73..0000000000 Binary files a/contrib/samples/ogl/studio/manual/bitmap1.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/manual/bitmap2.bmp b/contrib/samples/ogl/studio/manual/bitmap2.bmp deleted file mode 100644 index 3d523b2de9..0000000000 Binary files a/contrib/samples/ogl/studio/manual/bitmap2.bmp and /dev/null differ diff --git a/contrib/samples/ogl/studio/manual/copy.bmp b/contrib/samples/ogl/studio/manual/copy.bmp index 4551a06bfa..0a26d23ec3 100644 Binary files a/contrib/samples/ogl/studio/manual/copy.bmp and b/contrib/samples/ogl/studio/manual/copy.bmp differ diff --git a/contrib/samples/ogl/studio/manual/cut.bmp b/contrib/samples/ogl/studio/manual/cut.bmp index 15554338a0..e0de76cf51 100644 Binary files a/contrib/samples/ogl/studio/manual/cut.bmp and b/contrib/samples/ogl/studio/manual/cut.bmp differ diff --git a/contrib/samples/ogl/studio/manual/help.bmp b/contrib/samples/ogl/studio/manual/help.bmp index 2d9e6922ca..1b5e0b9603 100644 Binary files a/contrib/samples/ogl/studio/manual/help.bmp and b/contrib/samples/ogl/studio/manual/help.bmp differ diff --git a/contrib/samples/ogl/studio/manual/helpcs.bmp b/contrib/samples/ogl/studio/manual/helpcs.bmp index 8837381681..d6413e1d75 100644 Binary files a/contrib/samples/ogl/studio/manual/helpcs.bmp and b/contrib/samples/ogl/studio/manual/helpcs.bmp differ diff --git a/contrib/samples/ogl/studio/manual/new.bmp b/contrib/samples/ogl/studio/manual/new.bmp index d66feb2384..c832e3e7d5 100644 Binary files a/contrib/samples/ogl/studio/manual/new.bmp and b/contrib/samples/ogl/studio/manual/new.bmp differ diff --git a/contrib/samples/ogl/studio/manual/open.bmp b/contrib/samples/ogl/studio/manual/open.bmp index bbf93fe033..cc9e2881cc 100644 Binary files a/contrib/samples/ogl/studio/manual/open.bmp and b/contrib/samples/ogl/studio/manual/open.bmp differ diff --git a/contrib/samples/ogl/studio/manual/paste.bmp b/contrib/samples/ogl/studio/manual/paste.bmp index 564f514e0d..fd48d66c49 100644 Binary files a/contrib/samples/ogl/studio/manual/paste.bmp and b/contrib/samples/ogl/studio/manual/paste.bmp differ diff --git a/contrib/samples/ogl/studio/manual/preview.bmp b/contrib/samples/ogl/studio/manual/preview.bmp index da1f4dbc4b..a8bcdf5eff 100644 Binary files a/contrib/samples/ogl/studio/manual/preview.bmp and b/contrib/samples/ogl/studio/manual/preview.bmp differ diff --git a/contrib/samples/ogl/studio/manual/print.bmp b/contrib/samples/ogl/studio/manual/print.bmp index 00319b55bb..885d2e8d16 100644 Binary files a/contrib/samples/ogl/studio/manual/print.bmp and b/contrib/samples/ogl/studio/manual/print.bmp differ diff --git a/contrib/samples/ogl/studio/manual/redo.bmp b/contrib/samples/ogl/studio/manual/redo.bmp index 5877e34e00..5e97912b9a 100644 Binary files a/contrib/samples/ogl/studio/manual/redo.bmp and b/contrib/samples/ogl/studio/manual/redo.bmp differ diff --git a/contrib/samples/ogl/studio/manual/save.bmp b/contrib/samples/ogl/studio/manual/save.bmp index 56dd10b6e3..0df022cbb7 100644 Binary files a/contrib/samples/ogl/studio/manual/save.bmp and b/contrib/samples/ogl/studio/manual/save.bmp differ diff --git a/contrib/samples/ogl/studio/manual/undo.bmp b/contrib/samples/ogl/studio/manual/undo.bmp index 4ad80c772f..17447ace6b 100644 Binary files a/contrib/samples/ogl/studio/manual/undo.bmp and b/contrib/samples/ogl/studio/manual/undo.bmp differ diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp index c77d46ed0d..009e1776a1 100644 --- a/contrib/samples/ogl/studio/studio.cpp +++ b/contrib/samples/ogl/studio/studio.cpp @@ -37,7 +37,6 @@ #include "project.h" #include "symbols.h" -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "bitmaps/new.xpm" #include "bitmaps/open.xpm" #include "bitmaps/save.xpm" @@ -62,7 +61,6 @@ #include "bitmaps/straight.xpm" #include "studio.xpm" -#endif IMPLEMENT_APP(csApp) @@ -315,18 +313,6 @@ void csApp::InitToolBar(wxToolBar* toolBar) { wxBitmap* bitmaps[10]; -#ifdef __WXMSW__ - bitmaps[0] = new wxBitmap("new", wxBITMAP_TYPE_RESOURCE); - bitmaps[1] = new wxBitmap("open", wxBITMAP_TYPE_RESOURCE); - bitmaps[2] = new wxBitmap("save", wxBITMAP_TYPE_RESOURCE); - bitmaps[3] = new wxBitmap("copy", wxBITMAP_TYPE_RESOURCE); - bitmaps[4] = new wxBitmap("cut", wxBITMAP_TYPE_RESOURCE); - bitmaps[5] = new wxBitmap("paste", wxBITMAP_TYPE_RESOURCE); - bitmaps[6] = new wxBitmap("print", wxBITMAP_TYPE_RESOURCE); - bitmaps[7] = new wxBitmap("help", wxBITMAP_TYPE_RESOURCE); - bitmaps[8] = new wxBitmap("undo", wxBITMAP_TYPE_RESOURCE); - bitmaps[9] = new wxBitmap("redo", wxBITMAP_TYPE_RESOURCE); -#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) bitmaps[0] = new wxBitmap( new_xpm ); bitmaps[1] = new wxBitmap( open_xpm ); bitmaps[2] = new wxBitmap( save_xpm ); @@ -337,36 +323,33 @@ void csApp::InitToolBar(wxToolBar* toolBar) bitmaps[7] = new wxBitmap( help_xpm ); bitmaps[8] = new wxBitmap( undo_xpm ); bitmaps[9] = new wxBitmap( redo_xpm ); -#else -#error "Not implemented for this platform." -#endif - toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, FALSE, -1, -1, NULL, "New file"); - toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, FALSE, -1, -1, NULL, "Open file"); - toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, FALSE, -1, -1, NULL, "Save file"); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, FALSE, -1, -1, NULL, "Print"); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, FALSE, -1, -1, NULL, "Copy"); - toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, FALSE, -1, -1, NULL, "Cut"); - toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, FALSE, -1, -1, NULL, "Paste"); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, FALSE, -1, -1, NULL, "Undo"); - toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, FALSE, -1, -1, NULL, "Redo"); - toolBar->AddSeparator(); - toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, FALSE, -1, -1, NULL, "Help"); + toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, FALSE, -1, -1, NULL, "New file"); + toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, FALSE, -1, -1, NULL, "Open file"); + toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, FALSE, -1, -1, NULL, "Save file"); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, FALSE, -1, -1, NULL, "Print"); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, FALSE, -1, -1, NULL, "Copy"); + toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, FALSE, -1, -1, NULL, "Cut"); + toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, FALSE, -1, -1, NULL, "Paste"); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, FALSE, -1, -1, NULL, "Undo"); + toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, FALSE, -1, -1, NULL, "Redo"); + toolBar->AddSeparator(); + toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, FALSE, -1, -1, NULL, "Help"); - toolBar->Realize(); + toolBar->Realize(); - toolBar->EnableTool(wxID_COPY, FALSE); - toolBar->EnableTool(wxID_PASTE, FALSE); - toolBar->EnableTool(wxID_PRINT, FALSE); - toolBar->EnableTool(wxID_UNDO, FALSE); - toolBar->EnableTool(wxID_REDO, FALSE); + toolBar->EnableTool(wxID_COPY, FALSE); + toolBar->EnableTool(wxID_PASTE, FALSE); + toolBar->EnableTool(wxID_PRINT, FALSE); + toolBar->EnableTool(wxID_UNDO, FALSE); + toolBar->EnableTool(wxID_REDO, FALSE); - int i; - for (i = 0; i < 10; i++) - delete bitmaps[i]; + int i; + for (i = 0; i < 10; i++) + delete bitmaps[i]; } // Create and initialise the diagram toolbar diff --git a/contrib/samples/ogl/studio/studio.rc b/contrib/samples/ogl/studio/studio.rc index 70a7a9c9e4..78f32f3459 100644 --- a/contrib/samples/ogl/studio/studio.rc +++ b/contrib/samples/ogl/studio/studio.rc @@ -7,21 +7,10 @@ aaaa ICON "studio.ico" wxSTD_MDIPARENTFRAME ICON "studio.ico" wxSTD_MDICHILDFRAME ICON "studio.ico" -studio ICON "studio.ico" +studio ICON "studio.ico" folder1 ICON "bitmaps/folder1.ico" file1 ICON "bitmaps/file1.ico" -new BITMAP "bitmaps/new.bmp" -open BITMAP "bitmaps/open.bmp" -save BITMAP "bitmaps/save.bmp" -copy BITMAP "bitmaps/copy.bmp" -cut BITMAP "bitmaps/cut.bmp" -paste BITMAP "bitmaps/paste.bmp" -print BITMAP "bitmaps/print.bmp" -help BITMAP "bitmaps/help.bmp" -undo BITMAP "bitmaps/undo.bmp" -redo BITMAP "bitmaps/redo.bmp" - arrowtool BITMAP "bitmaps/arrow.bmp" texttool BITMAP "bitmaps/texttool.bmp" diff --git a/contrib/samples/svg/bitmaps/help.xpm b/contrib/samples/svg/bitmaps/help.xpm index e9e215ff2d..161b6b2658 100644 --- a/contrib/samples/svg/bitmaps/help.xpm +++ b/contrib/samples/svg/bitmaps/help.xpm @@ -1,25 +1,71 @@ -/* XPM */ -static char *help_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 4 1", -" c None", -". c Black", -"X c Blue", -"o c #000080", -/* pixels */ -" ", -" ...... ", -" .XXXXX.. ", -" .XX...oX.. ", -" .X.. .X.. ", -" .X.. .XX.. ", -" .. .XX.. ", -" .XX.. ", -" .X.. ", -" .X.. ", -" .o.. ", -" .. ", -" .XX.. ", -" .XX.. ", -" ... " -}; +/* XPM */ +static char *help_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 15 50 1", +"j c #4E7FD0", +"8 c #EDF2FB", +", c #7198D9", +"e c #DCE6F6", +"y c #FFFFFF", +"5 c #95B2E3", +"$ c #9AB6E4", +"g c #EAF0FA", +"1 c #2D59A3", +"@ c #B1C7EB", +"> c #6992D7", +"a c #D9E4F5", +"r c #356AC1", +"6 c #9BB7E5", +"= c #F7F9FD", +"+ c #BED0EE", +"z c #F0F5FC", +"f c #ADC4E9", +"# c #A8C0E8", +"7 c #CBD9F1", +"u c #366BC2", +" c None", +"c c #FDFEFF", +"w c #274D8D", +"t c #C4D5F0", +"% c #7CA0DC", +"h c #E2EAF8", +"p c #487BCE", +"o c #4377CD", +"4 c #2A549A", +"< c #254A87", +"O c #CCDAF2", +"& c #89A9DF", +"9 c #2B559B", +"* c #D2DFF4", +". c #3366BB", +": c #2E5CA8", +"x c #FAFCFE", +"l c #F5F8FD", +"2 c #799EDB", +"d c #DFE8F7", +"; c #A6BFE8", +"3 c #638ED5", +"- c #5282D0", +"X c #2A5398", +"0 c #B8CCEC", +"s c #376EC9", +"q c #2D5AA5", +"i c #285092", +"k c #8CACE0", +/* pixels */ +" .......Xo ", +" .O+@#$%.&o ", +" .*O+@#$.=&- ", +" ;:::>#@#.==&: ", +" ,<1234<>@....: ", +"5 c #3366BB", +"$ c #2E5CA8", +"9 c #FAFCFE", +"4 c #F5F8FD", +"q c #638ED5", +"o c #5282D0", +"& c #B8CCEC", +"X c #376EC9", +"< c #ACE95B", +/* pixels */ +" .XoO+@#$. ", +" .%%&*=-O;: ", +" >>>>%&*=O,=o ", +" ><<>%%&*O,,=o", +">>><<>>>%&OOo+@", +"><<<<<<>1%&*=-@", +"><<<<<<>21%&*=@", +">>><<>>>321%&*+", +" ><<>456321%&O", +" >>>>7456321%o", +" .,8974563210", +" .,,897456320", +" .,,,8974563q", +" .,,,,897456w", +" ............" +}; diff --git a/contrib/samples/svg/bitmaps/save.xpm b/contrib/samples/svg/bitmaps/save.xpm index 0f743dac37..accf1f9eb2 100644 --- a/contrib/samples/svg/bitmaps/save.xpm +++ b/contrib/samples/svg/bitmaps/save.xpm @@ -1,25 +1,42 @@ -/* XPM */ -static char *save_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 15 4 1", -" c None", -". c Black", -"X c #808000", -"o c #808080", -/* pixels */ -" ", -" .............. ", -" .X. . . ", -" .X. ... ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .XX........oX. ", -" .XXXXXXXXXXXX. ", -" .XX.........X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" ............. " -}; +/* XPM */ +static char *save_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 15 21 1", +": c #AAC1E8", +"1 c #B9CDED", +"O c #FFFFFF", +" c #2C58A0", +"* c #B0C6EA", +"; c #2D59A3", +"X c #1C3866", +"= c #C3D4EF", +"2 c #CBD9F1", +"- c #DAE5F6", +"# c #97B4E3", +". c None", +"$ c #274D8B", +"& c #9FB9E5", +"@ c #5584D1", +"% c #82A5DE", +"o c #3A70CA", +"< c #A5BEE7", +", c #D2DFF4", +"+ c #3467BC", +"> c #C0D1EE", +/* pixels */ +" .", +" XoOOOOOOOOO+X .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @@+++++++++@@ .", +" @@@@@@@@@@@@@ .", +" @@@$$$$$$$$@@ .", +" @@$%%%&*=-O$@ .", +" @@$%X;;*=-O$@ .", +" @@$%X;;:>,O$@ .", +" @@$%X;;<12O$@ .", +" @@$<<2OOOOO$@ .", +". .." +}; diff --git a/demos/dbbrowse/bitmaps/f_closed.ico b/demos/dbbrowse/bitmaps/f_closed.ico index 387080ef43..806b900a30 100644 Binary files a/demos/dbbrowse/bitmaps/f_closed.ico and b/demos/dbbrowse/bitmaps/f_closed.ico differ diff --git a/demos/dbbrowse/bitmaps/f_closed.xpm b/demos/dbbrowse/bitmaps/f_closed.xpm index 8e17fcff85..c0930b4089 100644 --- a/demos/dbbrowse/bitmaps/f_closed.xpm +++ b/demos/dbbrowse/bitmaps/f_closed.xpm @@ -1,28 +1,134 @@ /* XPM */ -static char * FolderClosed_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 6 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffff00", -"$ c #ffffff", +static char *FolderClosed_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 112 2", +"r c #F7FAFD", +"%. c #3562AF", +"=. c #3F6AB2", +"- c #4975BE", +"O. c #A5BDE6", +"k c #446EB4", +"d c #B9CDEC", +"5 c #AFC5EA", +"@ c #6790D4", +".. c #769CDA", +"M c #6787BD", +"D c #CDDAF1", +"F c #D7E2F5", +"] c #99B5E4", +"% c #4772B8", +";. c #476FB3", +">. c #4C73B5", +"@. c #5B7FBA", +"` c #4F80CF", +"*. c #3B67B0", +"O c #406BB2", +"N c #406BB3", +"R c #6891D6", +"j c #6888BD", +"( c #D8E3F5", +"$ c #3460A9", +"& c #4873BA", +"' c #5C89D3", +"-. c #436CB2", +"u c #4870B4", +"[ c #B8CBEC", +"7 c #C2D3EF", +"H c #3C68B1", +"a c #A2BBE6", +"+ c #6E96D8", +": c #698FCE", +"9 c #D4E0F4", +"t c #FCFDFE", +":. c #4971B4", +"3 c #4E75B6", +"< c #6C93D1", +"6 c #B9CCEC", +"c c #C3D4EF", +"l c #80A3DD", +"| c #4276CC", +"q c #E6EDF9", +"e c #F0F5FC", +"#. c #2E5AA6", +"x c #A3BCE6", +"s c #ADC4E9", +"B c #749BDA", +"1. c #567AB7", +", c #6A90D0", +"# c #6589C5", +"G c #6586BD", +"8 c #CBD9F1", +"g c #D5E1F4", +"z c #8DACE0", +"p c #97B4E3", +" c None", +"* c #4A75BC", +"+. c #C4D5EF", +"V c #81A4DD", +"m c #ECF2FA", +"n c #E7EEF9", +"Y c #3966B1", +"Z c #A4BDE6", +"A c #AEC5E9", +"o c #436BAD", +"T c #5C88D2", +"J c #6690D5", +"<. c #5277B6", +") c #6183BC", +"f c #CCDAF1", +"v c #D6E2F5", +"o. c #98B5E3", +"Q c #8EADE1", +" . c #5080CF", +"= c #4B76BE", +"I c #B6CAEC", +"S c #BBCEED", +"_ c #3563AF", +"! c #A5BEE6", +"/ c #CDDBF2", +"X. c #8FAEE1", +"0 c #DFE8F7", +"$. c #3160AE", +"} c #3160AF", +"4 c #A1BBE5", +"1 c #6D93D1", +"{ c #5E81BB", +"U c #6385BC", +"^ c #C4D4EF", +"2 c #597DBC", +"K c #81A3DD", +"i c #8BABE0", +"w c #ECF1FA", +"h c #F1F5FC", +"&. c #3965B0", +"X c #3E69B1", +"P c #AEC4E9", +"~ c #B8CCEC", +"; c #5C84C6", +"E c #759BDA", +"y c #6B8ABE", +"b c #E0E9F7", +"C c #98B4E3", +". c #325EA7", +"> c #6990CE", +",. c #5076B6", +"W c #82A4DD", +"L c #8CACE0", /* pixels */ -" ", -" @@@@@ ", -" @#+#+#@ ", -" @#+#+#+#@@@@@@ ", -" @$$$$$$$$$$$$@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @@@@@@@@@@@@@@.", -" ..............", -" ", -" "}; +" ", +" ", +" . X X X o ", +" O + + + @ # ", +" $ % & * = - ; : : > , < 1 2 ", +" 3 4 5 6 7 8 9 0 q w e r t y ", +" u i p a s d 7 f g 0 q w h j ", +" k l z p x 5 6 c f v b n m M ", +" N B V z C Z A S c D F b n G ", +" H J B K L C x P I c f v b U ", +" Y T R E W Q C ! P ~ ^ / ( ) ", +" _ ` ' R E W z ] Z P [ ^ / { ", +" } | .' R ..V X.o.O.P [ +.@. ", +" #.$.%.&.*.=.-.;.:.>.,.<.1.*. ", +" ", +" " +}; diff --git a/demos/dbbrowse/bitmaps/f_open.ico b/demos/dbbrowse/bitmaps/f_open.ico index 84c781f3b9..f0f581199a 100644 Binary files a/demos/dbbrowse/bitmaps/f_open.ico and b/demos/dbbrowse/bitmaps/f_open.ico differ diff --git a/demos/dbbrowse/bitmaps/f_open.xpm b/demos/dbbrowse/bitmaps/f_open.xpm index 81976bcca8..3603ca3290 100644 --- a/demos/dbbrowse/bitmaps/f_open.xpm +++ b/demos/dbbrowse/bitmaps/f_open.xpm @@ -1,28 +1,78 @@ /* XPM */ -static char * FolderOpen_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 6 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffff00", -"$ c #ffffff", +static char *FolderOpen_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 15 57 1", +"u c #83A5DD", +"h c #83A5DE", +"> c #DAE3F2", +": c #F3F7FC", +"t c #4A79C6", +"s c #274E8F", +"n c #4D71AB", +"5 c #C2D0E8", +"9 c #84A6DE", +"x c #3761A5", +"p c #ACC3E8", +"$ c #ACC3E9", +"= c #D9E4F5", +"o c #91AFE2", +"f c #5886D1", +"2 c #B9CCEC", +"& c #C3D4EF", +"; c #EBF1FA", +"7 c #4270BC", +"# c #9EB8E5", +"0 c #ADC4E9", +"y c #658FD5", +" c None", +"@ c #688DCA", +"< c #779CDA", +"r c #2A5498", +"l c #254A87", +"g c #6690D5", +"M c #5778AE", +"m c #5274AD", +"a c #D6E2F4", +", c #4672BA", +"v c #4168A8", +"c c #3C64A7", +". c #416BB2", +"- c #E3EBF8", +"z c #305CA3", +"X c #446CAE", +"O c #5882C8", +"N c #5D7DB0", +"3 c #C3D3EF", +"b c #476DAA", +"k c #ADC3E9", +"e c #E4ECF8", +"d c #4576C7", +"q c #C4D4EF", +"* c #CEDCF2", +"i c #90AFE1", +"4 c #ECF1FA", +"B c #4D72AE", +"% c #B8CCEC", +"8 c #759BDA", +"+ c #617FB1", +"1 c #9DB8E4", +"j c #9DB8E5", +"6 c #3762AA", +"w c #CFDDF2", /* pixels */ " ", -" @@@@@ ", -" @$$$$$@ ", -" @$#+#+#$@@@@@@ ", -" @$+#+#+$$$$$$@.", -" @$#+#+#+#+#+#@.", -"@@@@@@@@@@@@@#@.", -"@$$$$$$$$$$@@+@.", -"@$#+#+#+#+##.@@.", -" @$#+#+#+#+#+.@.", -" @$+#+#+#+#+#.@.", -" @$+#+#+#+##@..", -" @@@@@@@@@@@@@.", -" .............", " ", -" "}; +" .... ", +" Xooo. ", +" Xoooo....... ", +" Xoooooooooo. ", +" XoOOOOOOOOOOO+ ", +" Xo@#$%&*=-;:>+ ", +" X, c #9FB9E5", +"y c #5584D1", +"w c #3569BF", +"% c #3A70CA", +"+ c #305FAC", +"3 c #5D89D3", +"0 c #D2DFF4", +"@ c #CAE2AA", +"= c #B2D58C", +"2 c #FAFCFE", +"# c #638ED5", +"* c #CEDCF2", +"4 c #90AFE2", +"< c #B3C8EB", +"7 c #E5EDF9", +"- c #A2BCE6", +"o c #DFF0D0", /* pixels */ " ", -" ... ", -" . . .", -" ..", -" ... ...", -" .XoX....... ", -" .oXoXoXoXo. ", -" .XoXoXoXoX. ", -" .oXoX..........", -" .XoX.OOOOOOOOO.", -" .oo.OOOOOOOOO. ", -" .X.OOOOOOOOO. ", -" ..OOOOOOOOO. ", -" ........... ", +" .... ", +"XXXXX .oo. ", +"XOOOO+ .@o. ", +"XOOOO#$%.&*XXX ", +"XOOOOOOO.=*X-X ", +"XOXXXX...;*XXXX:", +"XOX>,<.11111*X2:", +"X3X4>,<.111*X5-:", +"XX#64>,,.1*X78: ", +"XXO964>,,.X0q7: ", +"Xw3O964>,,er0t: ", +"X%y3O964>, c #3366BB", +"$ c #2E5CA8", +"9 c #FAFCFE", +"4 c #F5F8FD", +"q c #638ED5", +"o c #5282D0", +"& c #B8CCEC", +"X c #376EC9", +"< c #ACE95B", +/* pixels */ +" .XoO+@#$. ", +" .%%&*=-O;: ", +" >>>>%&*=O,=o ", +" ><<>%%&*O,,=o ", +">>><<>>>%&OOo+@ ", +"><<<<<<>1%&*=-@ ", +"><<<<<<>21%&*=@ ", +">>><<>>>321%&*+ ", +" ><<>456321%&O ", +" >>>>7456321%o ", +" .,8974563210 ", +" .,,897456320 ", +" .,,,8974563q ", +" .,,,,897456w ", +" ............ " +}; diff --git a/include/wx/msw/csquery.bmp b/include/wx/msw/csquery.bmp index 7a63555268..4e7bcdc30b 100644 Binary files a/include/wx/msw/csquery.bmp and b/include/wx/msw/csquery.bmp differ diff --git a/samples/image/smile.xbm b/samples/image/smile.xbm index 9b8a7b4a8e..cc13b147f6 100644 --- a/samples/image/smile.xbm +++ b/samples/image/smile.xbm @@ -1,53 +1,15 @@ -#define smile_width 50 -#define smile_height 50 +#define smile_width 32 +#define smile_height 32 static unsigned char smile_bits[] = { - 0xff, 0xff, 0x07, 0xc0, 0xff, 0xff, 0xff, - 0xff, 0x7f, 0x00, 0x00, 0xfc, 0xff, 0xff, - 0xff, 0x1f, 0x00, 0x00, 0xf0, 0xff, 0xff, - 0xff, 0x07, 0x00, 0x00, 0xc0, 0xff, 0xff, - 0xff, 0x03, 0x00, 0x00, 0x80, 0xff, 0xff, - 0xff, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, - 0x7f, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, - 0x3f, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, - 0x1f, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, - 0x0f, 0xc0, 0x01, 0x00, 0x07, 0xe0, 0xff, - 0x07, 0xe0, 0x03, 0x80, 0x0f, 0xc0, 0xff, - 0x07, 0xf0, 0x07, 0xc0, 0x1f, 0xc0, 0xff, - 0x03, 0xf0, 0x07, 0xc0, 0x1f, 0x80, 0xff, - 0x03, 0xf0, 0x07, 0xc0, 0x1f, 0x80, 0xff, - 0x01, 0xe0, 0x03, 0x80, 0x0f, 0x00, 0xff, - 0x01, 0xc0, 0x01, 0x00, 0x07, 0x00, 0xff, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, - 0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0xff, - 0x01, 0x06, 0x00, 0x00, 0x10, 0x00, 0xff, - 0x01, 0x06, 0x00, 0x00, 0x18, 0x00, 0xff, - 0x01, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0xff, - 0x03, 0x38, 0x00, 0x00, 0x0e, 0x80, 0xff, - 0x03, 0xf0, 0x01, 0x00, 0x07, 0x80, 0xff, - 0x07, 0xe0, 0x0f, 0xc0, 0x03, 0xc0, 0xff, - 0x07, 0x80, 0xff, 0xff, 0x01, 0xc0, 0xff, - 0x0f, 0x00, 0xfe, 0xff, 0x00, 0xe0, 0xff, - 0x1f, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, - 0x3f, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, - 0x7f, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, - 0xff, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, - 0xff, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xff, 0x03, 0x00, 0x00, 0x80, 0xff, 0xff, - 0xff, 0x07, 0x00, 0x00, 0xc0, 0xff, 0xff, - 0xff, 0x1f, 0x00, 0x00, 0xf0, 0xff, 0xff, - 0xff, 0x7f, 0x00, 0x00, 0xfc, 0xff, 0xff, - 0xff, 0xff, 0x07, 0xc0, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, 0x1c, 0x1c, 0x00, + 0x00, 0x03, 0x60, 0x00, 0x80, 0x00, 0x80, 0x00, 0x60, 0x00, 0x00, 0x03, + 0x20, 0x00, 0x00, 0x04, 0x10, 0x08, 0x08, 0x04, 0x08, 0x14, 0x14, 0x08, + 0x08, 0x22, 0x22, 0x10, 0x04, 0x01, 0x40, 0x10, 0x04, 0x08, 0x08, 0x10, + 0x04, 0x08, 0x08, 0x10, 0x02, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00, 0x20, + 0x02, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00, 0x20, 0x02, 0x02, 0x20, 0x20, + 0x04, 0x0e, 0x38, 0x10, 0x04, 0x3e, 0x3e, 0x10, 0x04, 0xf4, 0x1b, 0x10, + 0x08, 0xd8, 0x0a, 0x10, 0x08, 0xb0, 0x07, 0x08, 0x10, 0xc0, 0x01, 0x04, + 0x20, 0x00, 0x00, 0x04, 0x60, 0x00, 0x00, 0x03, 0x80, 0x00, 0x80, 0x00, + 0x00, 0x03, 0x60, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0xe0, 0x03, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + diff --git a/samples/mdi/bitmaps/copy.xpm b/samples/mdi/bitmaps/copy.xpm index 47565c1cae..00ae82e213 100644 --- a/samples/mdi/bitmaps/copy.xpm +++ b/samples/mdi/bitmaps/copy.xpm @@ -1,25 +1,44 @@ /* XPM */ static char *copy_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 4 1", +"16 15 23 1", +"+ c #769CDA", +": c #DCE6F6", +"X c #3365B7", +"* c #FFFFFF", +"o c #9AB6E4", +"< c #EAF0FA", +"# c #B1C7EB", +". c #6992D7", +"3 c #F7F9FD", +", c #F0F5FC", +"$ c #A8C0E8", " c None", -". c Black", -"X c Gray100", -"o c #000080", +"- c #FDFEFF", +"& c #C4D5F0", +"1 c #E2EAF8", +"O c #89A9DF", +"= c #D2DFF4", +"4 c #FAFCFE", +"2 c #F5F8FD", +"; c #DFE8F7", +"% c #B8CCEC", +"> c #E5EDF9", +"@ c #648FD6", /* pixels */ -" ", -" ...... ", -" .XXXX.. ", -" .XXXX.X. ", -" .X..X.oooooo ", -" .XXXXXoXXXXoo ", -" .X....oXXXXoXo ", -" .XXXXXoX..Xoooo", -" .X....oXXXXXXXo", -" .XXXXXoX.....Xo", -" ......oXXXXXXXo", -" oX.....Xo", -" oXXXXXXXo", -" ooooooooo", -" " +" .....XX ", +" .oO+@X#X ", +" .$oO+X##X ", +" .%$o........ ", +" .&%$.*=&#o.-. ", +" .=&%.*;=&#.--. ", +" .:=&.*>;=&.... ", +" .>:=.*,>;=&#o. ", +" .<1:.*2,>:=&#. ", +" .2<1.*32,>:=&. ", +" .32<.*432,>:=. ", +" .32<.*-432,>:. ", +" .....**-432,>. ", +" .***-432,. ", +" .......... " }; diff --git a/samples/mdi/bitmaps/cut.xpm b/samples/mdi/bitmaps/cut.xpm index bfe7e95cea..8afa8f6d15 100644 --- a/samples/mdi/bitmaps/cut.xpm +++ b/samples/mdi/bitmaps/cut.xpm @@ -1,24 +1,46 @@ /* XPM */ static char *cut_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 3 1", +"16 15 25 1", +"6 c #D8BDC0", +": c #C3C3C4", +"- c #FFFFFF", +". c #6C6D70", +"2 c #AD3A45", +"o c #DBDBDB", +"# c #939495", +"< c #E42234", +"& c #C3C5C8", +"; c #C6CCD3", +"% c #B7B7B8", " c None", -". c Black", -"X c #000080", +"* c #DFE0E2", +"5 c #B69596", +"3 c #9C2A35", +"1 c #CFCFD0", +", c #AB5C64", +"+ c #D2D3D4", +"$ c #BCBDBE", +"@ c #C6C8CA", +"> c #CDC0C1", +"O c #826F72", +"X c #979BA0", +"4 c #9B8687", +"= c #9FA0A0", /* pixels */ -" ", -" . . ", -" . . ", -" . . ", -" .. .. ", -" . . ", -" ... ", -" . ", -" X.X ", -" X XXX ", -" XXX X X ", -" X X X X ", -" X X X X ", -" X X XX ", -" XX " +" .X .o ", +" O.+ @. ", +" O. .. ", +" O#$ %.& ", +" O.*.. ", +" #%#.. ", +" O=-.. ", +" #%#;. ", +" OO:=O ", +" >,,<, ,<,,1 ", +" ><23<1 1<32<1 ", +" ,2 4< <5 2, ", +" <, ,2 2, ,< ", +" 23,<5 5<,32 ", +" 6225 522> " }; diff --git a/samples/mdi/bitmaps/help.xpm b/samples/mdi/bitmaps/help.xpm index 50fdb4157e..161b6b2658 100644 --- a/samples/mdi/bitmaps/help.xpm +++ b/samples/mdi/bitmaps/help.xpm @@ -1,25 +1,71 @@ /* XPM */ static char *help_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 4 1", +"16 15 50 1", +"j c #4E7FD0", +"8 c #EDF2FB", +", c #7198D9", +"e c #DCE6F6", +"y c #FFFFFF", +"5 c #95B2E3", +"$ c #9AB6E4", +"g c #EAF0FA", +"1 c #2D59A3", +"@ c #B1C7EB", +"> c #6992D7", +"a c #D9E4F5", +"r c #356AC1", +"6 c #9BB7E5", +"= c #F7F9FD", +"+ c #BED0EE", +"z c #F0F5FC", +"f c #ADC4E9", +"# c #A8C0E8", +"7 c #CBD9F1", +"u c #366BC2", " c None", -". c Black", -"X c Blue", -"o c #000080", +"c c #FDFEFF", +"w c #274D8D", +"t c #C4D5F0", +"% c #7CA0DC", +"h c #E2EAF8", +"p c #487BCE", +"o c #4377CD", +"4 c #2A549A", +"< c #254A87", +"O c #CCDAF2", +"& c #89A9DF", +"9 c #2B559B", +"* c #D2DFF4", +". c #3366BB", +": c #2E5CA8", +"x c #FAFCFE", +"l c #F5F8FD", +"2 c #799EDB", +"d c #DFE8F7", +"; c #A6BFE8", +"3 c #638ED5", +"- c #5282D0", +"X c #2A5398", +"0 c #B8CCEC", +"s c #376EC9", +"q c #2D5AA5", +"i c #285092", +"k c #8CACE0", /* pixels */ -" ", -" ...... ", -" .XXXXX.. ", -" .XX...oX.. ", -" .X.. .X.. ", -" .X.. .XX.. ", -" .. .XX.. ", -" .XX.. ", -" .X.. ", -" .X.. ", -" .o.. ", -" .. ", -" .XX.. ", -" .XX.. ", -" ... " +" .......Xo ", +" .O+@#$%.&o ", +" .*O+@#$.=&- ", +" ;:::>#@#.==&: ", +" ,<1234<>@....: ", +"5 c #3366BB", +"$ c #2E5CA8", +"9 c #FAFCFE", +"4 c #F5F8FD", +"q c #638ED5", +"o c #5282D0", +"& c #B8CCEC", +"X c #376EC9", +"< c #ACE95B", /* pixels */ -" ", -" ........ ", -" .XXXXXX.. ", -" .XXXXXX.X. ", -" .XXXXXX.... ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" ........... ", -" " +" .XoO+@#$. ", +" .%%&*=-O;: ", +" >>>>%&*=O,=o ", +" ><<>%%&*O,,=o ", +">>><<>>>%&OOo+@ ", +"><<<<<<>1%&*=-@ ", +"><<<<<<>21%&*=@ ", +">>><<>>>321%&*+ ", +" ><<>456321%&O ", +" >>>>7456321%o ", +" .,8974563210 ", +" .,,897456320 ", +" .,,,8974563q ", +" .,,,,897456w ", +" ............ " }; diff --git a/samples/mdi/bitmaps/open.xpm b/samples/mdi/bitmaps/open.xpm index 54748e910d..36e058fc8e 100644 --- a/samples/mdi/bitmaps/open.xpm +++ b/samples/mdi/bitmaps/open.xpm @@ -1,26 +1,57 @@ /* XPM */ static char *open_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 5 1", +"16 15 36 1", +", c #AAC1E8", +"1 c #9AEA53", +"q c #DCE6F6", +". c #295193", +"; c #A9D066", +"r c #C6D6F0", +"$ c #4A7CCE", +"9 c #779DDB", +"8 c #EAF0FA", +"O c #6E96D8", +"X c #214279", +"e c #BED0EE", +"6 c #85A7DF", +"5 c #F0F5FC", +"t c #ADC4E9", +": c #3161B1", " c None", -". c Black", -"X c Yellow", -"o c Gray100", -"O c #bfbf00", +"u c #274D8B", +"& c #BFDC9B", +"> c #9FB9E5", +"y c #5584D1", +"w c #3569BF", +"% c #3A70CA", +"+ c #305FAC", +"3 c #5D89D3", +"0 c #D2DFF4", +"@ c #CAE2AA", +"= c #B2D58C", +"2 c #FAFCFE", +"# c #638ED5", +"* c #CEDCF2", +"4 c #90AFE2", +"< c #B3C8EB", +"7 c #E5EDF9", +"- c #A2BCE6", +"o c #DFF0D0", /* pixels */ " ", -" ... ", -" . . .", -" ..", -" ... ...", -" .XoX....... ", -" .oXoXoXoXo. ", -" .XoXoXoXoX. ", -" .oXoX..........", -" .XoX.OOOOOOOOO.", -" .oo.OOOOOOOOO. ", -" .X.OOOOOOOOO. ", -" ..OOOOOOOOO. ", -" ........... ", +" .... ", +"XXXXX .oo. ", +"XOOOO+ .@o. ", +"XOOOO#$%.&*XXX ", +"XOOOOOOO.=*X-X ", +"XOXXXX...;*XXXX:", +"XOX>,<.11111*X2:", +"X3X4>,<.111*X5-:", +"XX#64>,,.1*X78: ", +"XXO964>,,.X0q7: ", +"Xw3O964>,,er0t: ", +"X%y3O964>, c #FEE3D7", +"O c #FFFFFF", +"o c #7B767D", +"% c #F79586", +"& c #CAE1F3", +"@ c #F08B62", +"# c #FCCBB8", +"- c #FDD8C9", +"4 c #FFF8F4", +"5 c #FFF5F0", " c None", -". c Black", -"X c Yellow", -"o c #808080", -"O c #000080", -"+ c Gray100", +"$ c #F8AA8F", +", c #EFF6FC", +"1 c #F7FBFD", +"2 c #FAFCFE", +"; c #DAEAF7", +": c #E9F3FA", +"6 c #FFFAF8", +". c #3C78A6", +"3 c #FFF1ED", +"X c #9B8687", +"+ c #FBBCA4", +"* c #B6D5EE", +"= c #F4F9FD", /* pixels */ -" ", -" .... ", -" .....XX..... ", -".ooo.X..X.ooo. ", -".oo. .oo. ", -".oo........oo. ", -".oooooooooooo. ", -".oooooOOOOOOO. ", -".oooooO+++++OO ", -".oooooO+++++O+O ", -".oooooO+OOO+OOO ", -".oooooO+++++++O ", -".oooooO+OOOOO+O ", -" .....O+++++++O ", -" OOOOOOOOO " +" ...... ", +" .XoOOOOoo. ", +".+XOOOOOOX@. ", +".+XXXXXXXX@. ", +".#++$$%@..... ", +".##++$$%.&*.=. ", +".-##++$$.;&.==. ", +".--##++$.:;.... ", +".>--##++.,:;&*. ", +".<>--##+.1,:;&. ", +".<<>--##.21,:;. ", +".3<<>--#.O21=:. ", +".45<<>--....... ", +".6453<>----. ", +"............ " }; diff --git a/samples/mdi/bitmaps/preview.xpm b/samples/mdi/bitmaps/preview.xpm index 0dfdca46e1..d0176b3546 100644 --- a/samples/mdi/bitmaps/preview.xpm +++ b/samples/mdi/bitmaps/preview.xpm @@ -1,26 +1,51 @@ /* XPM */ static char *preview_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 5 1", -" c Black", -". c None", -"X c Gray100", -"o c #808080", -"O c Cyan", +"16 15 30 1", +"1 c Black", +"= c #97C4E7", +"< c #FFFFFF", +", c #69A1CF", +". c #5A89A6", +"# c #3A749C", +"+ c #538BB1", +"> c #D1E5F5", +"o c #6792AE", +"% c #C3DDF1", +"8 c #749BB5", +"; c #619BC4", +"X c #6B97B6", +"@ c #4B82A8", +" c None", +"O c #5F8FB0", +"q c #84A5BB", +": c #71A8D1", +"- c #85BBE2", +"9 c #EFF6FC", +"7 c #F7FBFD", +"6 c #FAFCFE", +"2 c #7FA6C0", +"5 c #C00000", +"0 c #FDFDFE", +"3 c #E2EFF8", +"$ c #8EA9BC", +"& c #B6D5EE", +"* c #A5CCEA", +"4 c #F4F9FD", /* pixels */ -" .......", -" XXXXXXX ......", -" XXXXXXX . .....", -" XXXXXXX ....", -" XXXXXXXXXX ....", -" XXXXXXX ....", -" XXXXXX o..o ...", -" XXXXX oOO.oo ..", -" XXXXX .O..o. ..", -" XXXXX ....o. ..", -" XXXXX o..Ooo ..", -" XXXXXX o..o o..", -" XXXXXXX o .", -" XXXXXXXXXX . ", -" .. " +" ..XoO+@#$ ", +" .%%&*=-;:; ", +" .>>%&*=,<=X ", +" $%%%1112<<=X ", +" $3-1<<<1oXO+ ", +" $314<<<<1=-+ ", +" $31<<<<<1-=+ ", +" $31<<<<<1&*O ", +" $3-1<<<51>%X ", +" $367111551>8 ", +" $3-----95518 ", +" $3<067466551 ", +" $3--------551 ", +" $3<<<0666<<55 ", +" $$$$$$$$$$q$ " }; diff --git a/samples/mdi/bitmaps/print.xpm b/samples/mdi/bitmaps/print.xpm index 3c2e2be781..fae8103a9a 100644 --- a/samples/mdi/bitmaps/print.xpm +++ b/samples/mdi/bitmaps/print.xpm @@ -1,26 +1,56 @@ /* XPM */ static char *print_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 5 1", +"16 15 35 1", +"y c #EDF2FB", +"9 c #4E7FD0", +"> c #B9CDED", +"# c #3365B7", +"r c #FFFFFF", +"8 c #2C58A0", +"X c #779DDB", +"7 c #7FA2DD", +"t c #3263B4", +"q c #6E96D8", +"= c #6992D7", +"* c #D9E4F5", +"0 c #356AC1", +"& c #CBD9F1", +"; c #97B4E3", +"e c #3161B1", " c None", -". c Black", -"X c Gray100", -"o c #808000", -"O c Yellow", +"1 c #B5C9EB", +", c #7CA0DC", +"4 c #487BCE", +"- c #4377CD", +". c #5584D1", +"6 c #3A70CA", +"2 c #305FAC", +"< c #5685D2", +"w c #4075CC", +"5 c #638ED5", +"3 c #3467BC", +"% c #2F5DA9", +"o c #ECF1FA", +": c #D6E1F4", +"@ c #376EC9", +"$ c #2D5AA5", +"+ c #A2BCE6", +"O c #CFDDF3", /* pixels */ -" ", -" ......... ", -" .XXXXXXXX. ", -" .X.....X. ", -" .XXXXXXXX. ", -" .X.....X.... ", -" .XXXXXXXX. . .", -" .......... . ..", -". . . .", -"............. .", -". ooo . . ", -". OOO ... ", -"............. . ", -" . . . ", -" ........... " +" .XXXXXXXX ", +" .oooooooX ", +" .OOOOOOOX ", +" .+++++++X ", +" @@#$%%%%%$%@@ ", +"#&*=-=;:>,<#*&# ", +".11.2345.63#11. ", +"4;;;;;;;;;;;;;4 ", +"677588888889776 ", +"0qq60wwwwwweqq0 ", +"3553rrrrrrr$553 ", +"3< c #C0D1EE", /* pixels */ -" ", -" .............. ", -" .X. . . ", -" .X. ... ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .XX........oX. ", -" .XXXXXXXXXXXX. ", -" .XX.........X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" ............. " +" .", +" XoOOOOOOOOO+X .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @@+++++++++@@ .", +" @@@@@@@@@@@@@ .", +" @@@$$$$$$$$@@ .", +" @@$%%%&*=-O$@ .", +" @@$%X;;*=-O$@ .", +" @@$%X;;:>,O$@ .", +" @@$%X;;<12O$@ .", +" @@$<<2OOOOO$@ .", +". .." }; diff --git a/samples/menu/copy.xpm b/samples/menu/copy.xpm index 47565c1cae..00ae82e213 100644 --- a/samples/menu/copy.xpm +++ b/samples/menu/copy.xpm @@ -1,25 +1,44 @@ /* XPM */ static char *copy_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 4 1", +"16 15 23 1", +"+ c #769CDA", +": c #DCE6F6", +"X c #3365B7", +"* c #FFFFFF", +"o c #9AB6E4", +"< c #EAF0FA", +"# c #B1C7EB", +". c #6992D7", +"3 c #F7F9FD", +", c #F0F5FC", +"$ c #A8C0E8", " c None", -". c Black", -"X c Gray100", -"o c #000080", +"- c #FDFEFF", +"& c #C4D5F0", +"1 c #E2EAF8", +"O c #89A9DF", +"= c #D2DFF4", +"4 c #FAFCFE", +"2 c #F5F8FD", +"; c #DFE8F7", +"% c #B8CCEC", +"> c #E5EDF9", +"@ c #648FD6", /* pixels */ -" ", -" ...... ", -" .XXXX.. ", -" .XXXX.X. ", -" .X..X.oooooo ", -" .XXXXXoXXXXoo ", -" .X....oXXXXoXo ", -" .XXXXXoX..Xoooo", -" .X....oXXXXXXXo", -" .XXXXXoX.....Xo", -" ......oXXXXXXXo", -" oX.....Xo", -" oXXXXXXXo", -" ooooooooo", -" " +" .....XX ", +" .oO+@X#X ", +" .$oO+X##X ", +" .%$o........ ", +" .&%$.*=&#o.-. ", +" .=&%.*;=&#.--. ", +" .:=&.*>;=&.... ", +" .>:=.*,>;=&#o. ", +" .<1:.*2,>:=&#. ", +" .2<1.*32,>:=&. ", +" .32<.*432,>:=. ", +" .32<.*-432,>:. ", +" .....**-432,>. ", +" .***-432,. ", +" .......... " }; diff --git a/samples/minifram/bitmaps/copy.xpm b/samples/minifram/bitmaps/copy.xpm index 47565c1cae..00ae82e213 100644 --- a/samples/minifram/bitmaps/copy.xpm +++ b/samples/minifram/bitmaps/copy.xpm @@ -1,25 +1,44 @@ /* XPM */ static char *copy_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 4 1", +"16 15 23 1", +"+ c #769CDA", +": c #DCE6F6", +"X c #3365B7", +"* c #FFFFFF", +"o c #9AB6E4", +"< c #EAF0FA", +"# c #B1C7EB", +". c #6992D7", +"3 c #F7F9FD", +", c #F0F5FC", +"$ c #A8C0E8", " c None", -". c Black", -"X c Gray100", -"o c #000080", +"- c #FDFEFF", +"& c #C4D5F0", +"1 c #E2EAF8", +"O c #89A9DF", +"= c #D2DFF4", +"4 c #FAFCFE", +"2 c #F5F8FD", +"; c #DFE8F7", +"% c #B8CCEC", +"> c #E5EDF9", +"@ c #648FD6", /* pixels */ -" ", -" ...... ", -" .XXXX.. ", -" .XXXX.X. ", -" .X..X.oooooo ", -" .XXXXXoXXXXoo ", -" .X....oXXXXoXo ", -" .XXXXXoX..Xoooo", -" .X....oXXXXXXXo", -" .XXXXXoX.....Xo", -" ......oXXXXXXXo", -" oX.....Xo", -" oXXXXXXXo", -" ooooooooo", -" " +" .....XX ", +" .oO+@X#X ", +" .$oO+X##X ", +" .%$o........ ", +" .&%$.*=&#o.-. ", +" .=&%.*;=&#.--. ", +" .:=&.*>;=&.... ", +" .>:=.*,>;=&#o. ", +" .<1:.*2,>:=&#. ", +" .2<1.*32,>:=&. ", +" .32<.*432,>:=. ", +" .32<.*-432,>:. ", +" .....**-432,>. ", +" .***-432,. ", +" .......... " }; diff --git a/samples/minifram/bitmaps/cut.xpm b/samples/minifram/bitmaps/cut.xpm index bfe7e95cea..8afa8f6d15 100644 --- a/samples/minifram/bitmaps/cut.xpm +++ b/samples/minifram/bitmaps/cut.xpm @@ -1,24 +1,46 @@ /* XPM */ static char *cut_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 3 1", +"16 15 25 1", +"6 c #D8BDC0", +": c #C3C3C4", +"- c #FFFFFF", +". c #6C6D70", +"2 c #AD3A45", +"o c #DBDBDB", +"# c #939495", +"< c #E42234", +"& c #C3C5C8", +"; c #C6CCD3", +"% c #B7B7B8", " c None", -". c Black", -"X c #000080", +"* c #DFE0E2", +"5 c #B69596", +"3 c #9C2A35", +"1 c #CFCFD0", +", c #AB5C64", +"+ c #D2D3D4", +"$ c #BCBDBE", +"@ c #C6C8CA", +"> c #CDC0C1", +"O c #826F72", +"X c #979BA0", +"4 c #9B8687", +"= c #9FA0A0", /* pixels */ -" ", -" . . ", -" . . ", -" . . ", -" .. .. ", -" . . ", -" ... ", -" . ", -" X.X ", -" X XXX ", -" XXX X X ", -" X X X X ", -" X X X X ", -" X X XX ", -" XX " +" .X .o ", +" O.+ @. ", +" O. .. ", +" O#$ %.& ", +" O.*.. ", +" #%#.. ", +" O=-.. ", +" #%#;. ", +" OO:=O ", +" >,,<, ,<,,1 ", +" ><23<1 1<32<1 ", +" ,2 4< <5 2, ", +" <, ,2 2, ,< ", +" 23,<5 5<,32 ", +" 6225 522> " }; diff --git a/samples/minifram/bitmaps/help.xpm b/samples/minifram/bitmaps/help.xpm index 50fdb4157e..161b6b2658 100644 --- a/samples/minifram/bitmaps/help.xpm +++ b/samples/minifram/bitmaps/help.xpm @@ -1,25 +1,71 @@ /* XPM */ static char *help_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 4 1", +"16 15 50 1", +"j c #4E7FD0", +"8 c #EDF2FB", +", c #7198D9", +"e c #DCE6F6", +"y c #FFFFFF", +"5 c #95B2E3", +"$ c #9AB6E4", +"g c #EAF0FA", +"1 c #2D59A3", +"@ c #B1C7EB", +"> c #6992D7", +"a c #D9E4F5", +"r c #356AC1", +"6 c #9BB7E5", +"= c #F7F9FD", +"+ c #BED0EE", +"z c #F0F5FC", +"f c #ADC4E9", +"# c #A8C0E8", +"7 c #CBD9F1", +"u c #366BC2", " c None", -". c Black", -"X c Blue", -"o c #000080", +"c c #FDFEFF", +"w c #274D8D", +"t c #C4D5F0", +"% c #7CA0DC", +"h c #E2EAF8", +"p c #487BCE", +"o c #4377CD", +"4 c #2A549A", +"< c #254A87", +"O c #CCDAF2", +"& c #89A9DF", +"9 c #2B559B", +"* c #D2DFF4", +". c #3366BB", +": c #2E5CA8", +"x c #FAFCFE", +"l c #F5F8FD", +"2 c #799EDB", +"d c #DFE8F7", +"; c #A6BFE8", +"3 c #638ED5", +"- c #5282D0", +"X c #2A5398", +"0 c #B8CCEC", +"s c #376EC9", +"q c #2D5AA5", +"i c #285092", +"k c #8CACE0", /* pixels */ -" ", -" ...... ", -" .XXXXX.. ", -" .XX...oX.. ", -" .X.. .X.. ", -" .X.. .XX.. ", -" .. .XX.. ", -" .XX.. ", -" .X.. ", -" .X.. ", -" .o.. ", -" .. ", -" .XX.. ", -" .XX.. ", -" ... " +" .......Xo ", +" .O+@#$%.&o ", +" .*O+@#$.=&- ", +" ;:::>#@#.==&: ", +" ,<1234<>@....: ", +"5 c #3366BB", +"$ c #2E5CA8", +"9 c #FAFCFE", +"4 c #F5F8FD", +"q c #638ED5", +"o c #5282D0", +"& c #B8CCEC", +"X c #376EC9", +"< c #ACE95B", /* pixels */ -" ", -" ........ ", -" .XXXXXX.. ", -" .XXXXXX.X. ", -" .XXXXXX.... ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" ........... ", -" " +" .XoO+@#$. ", +" .%%&*=-O;: ", +" >>>>%&*=O,=o ", +" ><<>%%&*O,,=o ", +">>><<>>>%&OOo+@ ", +"><<<<<<>1%&*=-@ ", +"><<<<<<>21%&*=@ ", +">>><<>>>321%&*+ ", +" ><<>456321%&O ", +" >>>>7456321%o ", +" .,8974563210 ", +" .,,897456320 ", +" .,,,8974563q ", +" .,,,,897456w ", +" ............ " }; diff --git a/samples/minifram/bitmaps/open.xpm b/samples/minifram/bitmaps/open.xpm index 54748e910d..36e058fc8e 100644 --- a/samples/minifram/bitmaps/open.xpm +++ b/samples/minifram/bitmaps/open.xpm @@ -1,26 +1,57 @@ /* XPM */ static char *open_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 5 1", +"16 15 36 1", +", c #AAC1E8", +"1 c #9AEA53", +"q c #DCE6F6", +". c #295193", +"; c #A9D066", +"r c #C6D6F0", +"$ c #4A7CCE", +"9 c #779DDB", +"8 c #EAF0FA", +"O c #6E96D8", +"X c #214279", +"e c #BED0EE", +"6 c #85A7DF", +"5 c #F0F5FC", +"t c #ADC4E9", +": c #3161B1", " c None", -". c Black", -"X c Yellow", -"o c Gray100", -"O c #bfbf00", +"u c #274D8B", +"& c #BFDC9B", +"> c #9FB9E5", +"y c #5584D1", +"w c #3569BF", +"% c #3A70CA", +"+ c #305FAC", +"3 c #5D89D3", +"0 c #D2DFF4", +"@ c #CAE2AA", +"= c #B2D58C", +"2 c #FAFCFE", +"# c #638ED5", +"* c #CEDCF2", +"4 c #90AFE2", +"< c #B3C8EB", +"7 c #E5EDF9", +"- c #A2BCE6", +"o c #DFF0D0", /* pixels */ " ", -" ... ", -" . . .", -" ..", -" ... ...", -" .XoX....... ", -" .oXoXoXoXo. ", -" .XoXoXoXoX. ", -" .oXoX..........", -" .XoX.OOOOOOOOO.", -" .oo.OOOOOOOOO. ", -" .X.OOOOOOOOO. ", -" ..OOOOOOOOO. ", -" ........... ", +" .... ", +"XXXXX .oo. ", +"XOOOO+ .@o. ", +"XOOOO#$%.&*XXX ", +"XOOOOOOO.=*X-X ", +"XOXXXX...;*XXXX:", +"XOX>,<.11111*X2:", +"X3X4>,<.111*X5-:", +"XX#64>,,.1*X78: ", +"XXO964>,,.X0q7: ", +"Xw3O964>,,er0t: ", +"X%y3O964>, c #D1E5F5", +"o c #6792AE", +"% c #C3DDF1", +"8 c #749BB5", +"; c #619BC4", +"X c #6B97B6", +"@ c #4B82A8", +" c None", +"O c #5F8FB0", +"q c #84A5BB", +": c #71A8D1", +"- c #85BBE2", +"9 c #EFF6FC", +"7 c #F7FBFD", +"6 c #FAFCFE", +"2 c #7FA6C0", +"5 c #C00000", +"0 c #FDFDFE", +"3 c #E2EFF8", +"$ c #8EA9BC", +"& c #B6D5EE", +"* c #A5CCEA", +"4 c #F4F9FD", /* pixels */ -" .......", -" XXXXXXX ......", -" XXXXXXX . .....", -" XXXXXXX ....", -" XXXXXXXXXX ....", -" XXXXXXX ....", -" XXXXXX o..o ...", -" XXXXX oOO.oo ..", -" XXXXX .O..o. ..", -" XXXXX ....o. ..", -" XXXXX o..Ooo ..", -" XXXXXX o..o o..", -" XXXXXXX o .", -" XXXXXXXXXX . ", -" .. " +" ..XoO+@#$ ", +" .%%&*=-;:; ", +" .>>%&*=,<=X ", +" $%%%1112<<=X ", +" $3-1<<<1oXO+ ", +" $314<<<<1=-+ ", +" $31<<<<<1-=+ ", +" $31<<<<<1&*O ", +" $3-1<<<51>%X ", +" $367111551>8 ", +" $3-----95518 ", +" $3<067466551 ", +" $3--------551 ", +" $3<<<0666<<55 ", +" $$$$$$$$$$q$ " }; diff --git a/samples/minifram/bitmaps/print.xpm b/samples/minifram/bitmaps/print.xpm index 3c2e2be781..fae8103a9a 100644 --- a/samples/minifram/bitmaps/print.xpm +++ b/samples/minifram/bitmaps/print.xpm @@ -1,26 +1,56 @@ /* XPM */ static char *print_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 5 1", +"16 15 35 1", +"y c #EDF2FB", +"9 c #4E7FD0", +"> c #B9CDED", +"# c #3365B7", +"r c #FFFFFF", +"8 c #2C58A0", +"X c #779DDB", +"7 c #7FA2DD", +"t c #3263B4", +"q c #6E96D8", +"= c #6992D7", +"* c #D9E4F5", +"0 c #356AC1", +"& c #CBD9F1", +"; c #97B4E3", +"e c #3161B1", " c None", -". c Black", -"X c Gray100", -"o c #808000", -"O c Yellow", +"1 c #B5C9EB", +", c #7CA0DC", +"4 c #487BCE", +"- c #4377CD", +". c #5584D1", +"6 c #3A70CA", +"2 c #305FAC", +"< c #5685D2", +"w c #4075CC", +"5 c #638ED5", +"3 c #3467BC", +"% c #2F5DA9", +"o c #ECF1FA", +": c #D6E1F4", +"@ c #376EC9", +"$ c #2D5AA5", +"+ c #A2BCE6", +"O c #CFDDF3", /* pixels */ -" ", -" ......... ", -" .XXXXXXXX. ", -" .X.....X. ", -" .XXXXXXXX. ", -" .X.....X.... ", -" .XXXXXXXX. . .", -" .......... . ..", -". . . .", -"............. .", -". ooo . . ", -". OOO ... ", -"............. . ", -" . . . ", -" ........... " +" .XXXXXXXX ", +" .oooooooX ", +" .OOOOOOOX ", +" .+++++++X ", +" @@#$%%%%%$%@@ ", +"#&*=-=;:>,<#*&# ", +".11.2345.63#11. ", +"4;;;;;;;;;;;;;4 ", +"677588888889776 ", +"0qq60wwwwwweqq0 ", +"3553rrrrrrr$553 ", +"3< c #C0D1EE", /* pixels */ -" ", -" .............. ", -" .X. . . ", -" .X. ... ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .XX........oX. ", -" .XXXXXXXXXXXX. ", -" .XX.........X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" ............. " +" .", +" XoOOOOOOOOO+X .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @@+++++++++@@ .", +" @@@@@@@@@@@@@ .", +" @@@$$$$$$$$@@ .", +" @@$%%%&*=-O$@ .", +" @@$%X;;*=-O$@ .", +" @@$%X;;:>,O$@ .", +" @@$%X;;<12O$@ .", +" @@$<<2OOOOO$@ .", +". .." }; diff --git a/samples/printing/folder.xpm b/samples/printing/folder.xpm index 7a36fa27f1..9f25a3c29a 100644 --- a/samples/printing/folder.xpm +++ b/samples/printing/folder.xpm @@ -1,48 +1,81 @@ /* XPM */ static char * folder_xpm[] = { -"33 33 12 1", -" c None", -". c #D75CA69979E7", -"X c #208120812081", -"o c #FFFFFFFFFFFF", -"O c #B6DA79E74924", -"+ c #596559655965", -"@ c #410341034103", -"# c #514451445144", -"$ c #000000000820", -"% c #8E38596530C2", -"& c #8E3886178617", -"* c #492479E769A6", +/* columns rows colors chars-per-pixel */ +"33 33 42 1", +"0 c #AAC1E8", +"q c #B9CDED", +"X c #295193", +"e c #C6D6F0", +"s c #4A7CCE", +"& c #779DDB", +"* c #7FA2DD", +"2 c #EAF0FA", +"@ c #2D59A3", +"o c #6E96D8", +"y c #356AC1", +"f c #214279", +"w c #BED0EE", +"= c #85A7DF", +"< c #E1E9F7", +"3 c #F0F5FC", +"d c #CBD9F1", +", c #DAE5F6", +"7 c #3161B1", +" c None", +". c #274D8B", +"6 c #FDFEFF", +"i c #E7EEF9", +"9 c #9FB9E5", +"- c #89A9DF", +"8 c #98B5E4", +"$ c #5584D1", +"+ c #3569BF", +"% c #305FAC", +"O c #5D89D3", +"> c #D2DFF4", +"p c #3366B9", +"5 c #FAFCFE", +"4 c #F5F8FD", +"t c #4075CC", +"a c #A6BFE8", +"u c #638ED5", +"r c #CEDCF2", +"; c #90AFE2", +"# c #2F5DA9", +": c #B3C8EB", +"1 c #E5EDF9", +/* pixels */ " ", -" .. XXX ", -" .o.. X.XXX ", -" .ooo..OOOXXX ", -" .ooooo..OOOXXX ++ ", -"XXX .ooooooo..OOOXXX @#++@ ", -"XOX@X.ooooooooo...OOO@XX+X#+++ ", -"X...@@$.oooooooooo...OOXXX@X@+ ", -"O.....@XXOooooooooooo..OOOX@@X ", -"XO......@%X.ooooooooooo..%%OX@ ", -".O........@XX.oooooooooo.X%XX ", -" %O.........@@$.oooooooo.XX%X ", -" %O...........@@$.oooooo.X%X# ", -" %O.............@@X.oooo.XX%& ", -" .@...............@XX.oo.@XX ", -" %.................@X.o.XXX ", -" OO................O%X..XX@ ", -" +OO.......O..OOOOOOO@..@X& ", -" .%O....OOOOOOOOOOOOOX.+XX ", -" XOOOOOOOOOOOOOOOOOOX+*XX ", -" @OOOOO.OOOOOOOOOOOOX*+XX ", -" .%OOOOOOOOOOOOOOO%OXX#XX ", -" XOOOOOOOOOOO%O%O%%OX++& ", -" @O%O%OO%O%%O%%%%%%%XXX ", -" XXXO%%%%%%%%%%%%%%XXX ", -" OXXX%%%%%%%%%%%%@XX# ", -" OX@X%%%%%%%%%%%XXX ", -" OXXX%%%O%%%%%XXX ", -" OXXX%%%%%%%XX* ", -" OX@X%%%%X%X& ", -" OXXX%%%XX ", -" OXXX%%@ ", -" OXXX "}; +" ", +" ", +" ", +" ", +" ", +" ", +" ......X ", +" XoooooO. ", +" Xoooooo+. ", +" Xooooooo@XXXXXXXXXX# ", +" Xoooooooooooooooooo# ", +" Xoooooooooooooooooo# ", +" Xoo$################### ", +" Xoo%O&*=-;:>,<123445667 ", +" XooX890:qwer>,<123445q# ", +" Xoty;890:qwer>,<12344#q ", +" Xo%u-;890:qwer>,,,,<# ", +" XX$Ouo&*-;890:qwer>d# ", +" f%s$Ouo&*-;890:qwer#- ", +" f+ts$Ouo&*-;890:qwe# ", +" f..................# ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" " +}; diff --git a/samples/regtest/key1.ico b/samples/regtest/key1.ico index 57a5209acb..ca0d21cbec 100644 Binary files a/samples/regtest/key1.ico and b/samples/regtest/key1.ico differ diff --git a/samples/regtest/key2.ico b/samples/regtest/key2.ico index 082ff47291..ca0d21cbec 100644 Binary files a/samples/regtest/key2.ico and b/samples/regtest/key2.ico differ diff --git a/samples/regtest/key3.ico b/samples/regtest/key3.ico index 0cbb4c3360..ca0d21cbec 100644 Binary files a/samples/regtest/key3.ico and b/samples/regtest/key3.ico differ diff --git a/samples/toolbar/bitmaps/copy.bmp b/samples/toolbar/bitmaps/copy.bmp index 4551a06bfa..a21608fc23 100644 Binary files a/samples/toolbar/bitmaps/copy.bmp and b/samples/toolbar/bitmaps/copy.bmp differ diff --git a/samples/toolbar/bitmaps/copy.xpm b/samples/toolbar/bitmaps/copy.xpm index 47565c1cae..00ae82e213 100644 --- a/samples/toolbar/bitmaps/copy.xpm +++ b/samples/toolbar/bitmaps/copy.xpm @@ -1,25 +1,44 @@ /* XPM */ static char *copy_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 4 1", +"16 15 23 1", +"+ c #769CDA", +": c #DCE6F6", +"X c #3365B7", +"* c #FFFFFF", +"o c #9AB6E4", +"< c #EAF0FA", +"# c #B1C7EB", +". c #6992D7", +"3 c #F7F9FD", +", c #F0F5FC", +"$ c #A8C0E8", " c None", -". c Black", -"X c Gray100", -"o c #000080", +"- c #FDFEFF", +"& c #C4D5F0", +"1 c #E2EAF8", +"O c #89A9DF", +"= c #D2DFF4", +"4 c #FAFCFE", +"2 c #F5F8FD", +"; c #DFE8F7", +"% c #B8CCEC", +"> c #E5EDF9", +"@ c #648FD6", /* pixels */ -" ", -" ...... ", -" .XXXX.. ", -" .XXXX.X. ", -" .X..X.oooooo ", -" .XXXXXoXXXXoo ", -" .X....oXXXXoXo ", -" .XXXXXoX..Xoooo", -" .X....oXXXXXXXo", -" .XXXXXoX.....Xo", -" ......oXXXXXXXo", -" oX.....Xo", -" oXXXXXXXo", -" ooooooooo", -" " +" .....XX ", +" .oO+@X#X ", +" .$oO+X##X ", +" .%$o........ ", +" .&%$.*=&#o.-. ", +" .=&%.*;=&#.--. ", +" .:=&.*>;=&.... ", +" .>:=.*,>;=&#o. ", +" .<1:.*2,>:=&#. ", +" .2<1.*32,>:=&. ", +" .32<.*432,>:=. ", +" .32<.*-432,>:. ", +" .....**-432,>. ", +" .***-432,. ", +" .......... " }; diff --git a/samples/toolbar/bitmaps/cut.bmp b/samples/toolbar/bitmaps/cut.bmp index 15554338a0..d41668ab3f 100644 Binary files a/samples/toolbar/bitmaps/cut.bmp and b/samples/toolbar/bitmaps/cut.bmp differ diff --git a/samples/toolbar/bitmaps/cut.xpm b/samples/toolbar/bitmaps/cut.xpm index bfe7e95cea..8afa8f6d15 100644 --- a/samples/toolbar/bitmaps/cut.xpm +++ b/samples/toolbar/bitmaps/cut.xpm @@ -1,24 +1,46 @@ /* XPM */ static char *cut_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 3 1", +"16 15 25 1", +"6 c #D8BDC0", +": c #C3C3C4", +"- c #FFFFFF", +". c #6C6D70", +"2 c #AD3A45", +"o c #DBDBDB", +"# c #939495", +"< c #E42234", +"& c #C3C5C8", +"; c #C6CCD3", +"% c #B7B7B8", " c None", -". c Black", -"X c #000080", +"* c #DFE0E2", +"5 c #B69596", +"3 c #9C2A35", +"1 c #CFCFD0", +", c #AB5C64", +"+ c #D2D3D4", +"$ c #BCBDBE", +"@ c #C6C8CA", +"> c #CDC0C1", +"O c #826F72", +"X c #979BA0", +"4 c #9B8687", +"= c #9FA0A0", /* pixels */ -" ", -" . . ", -" . . ", -" . . ", -" .. .. ", -" . . ", -" ... ", -" . ", -" X.X ", -" X XXX ", -" XXX X X ", -" X X X X ", -" X X X X ", -" X X XX ", -" XX " +" .X .o ", +" O.+ @. ", +" O. .. ", +" O#$ %.& ", +" O.*.. ", +" #%#.. ", +" O=-.. ", +" #%#;. ", +" OO:=O ", +" >,,<, ,<,,1 ", +" ><23<1 1<32<1 ", +" ,2 4< <5 2, ", +" <, ,2 2, ,< ", +" 23,<5 5<,32 ", +" 6225 522> " }; diff --git a/samples/toolbar/bitmaps/help.bmp b/samples/toolbar/bitmaps/help.bmp index 2d9e6922ca..d5636e9aa2 100644 Binary files a/samples/toolbar/bitmaps/help.bmp and b/samples/toolbar/bitmaps/help.bmp differ diff --git a/samples/toolbar/bitmaps/help.xpm b/samples/toolbar/bitmaps/help.xpm index 50fdb4157e..161b6b2658 100644 --- a/samples/toolbar/bitmaps/help.xpm +++ b/samples/toolbar/bitmaps/help.xpm @@ -1,25 +1,71 @@ /* XPM */ static char *help_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 4 1", +"16 15 50 1", +"j c #4E7FD0", +"8 c #EDF2FB", +", c #7198D9", +"e c #DCE6F6", +"y c #FFFFFF", +"5 c #95B2E3", +"$ c #9AB6E4", +"g c #EAF0FA", +"1 c #2D59A3", +"@ c #B1C7EB", +"> c #6992D7", +"a c #D9E4F5", +"r c #356AC1", +"6 c #9BB7E5", +"= c #F7F9FD", +"+ c #BED0EE", +"z c #F0F5FC", +"f c #ADC4E9", +"# c #A8C0E8", +"7 c #CBD9F1", +"u c #366BC2", " c None", -". c Black", -"X c Blue", -"o c #000080", +"c c #FDFEFF", +"w c #274D8D", +"t c #C4D5F0", +"% c #7CA0DC", +"h c #E2EAF8", +"p c #487BCE", +"o c #4377CD", +"4 c #2A549A", +"< c #254A87", +"O c #CCDAF2", +"& c #89A9DF", +"9 c #2B559B", +"* c #D2DFF4", +". c #3366BB", +": c #2E5CA8", +"x c #FAFCFE", +"l c #F5F8FD", +"2 c #799EDB", +"d c #DFE8F7", +"; c #A6BFE8", +"3 c #638ED5", +"- c #5282D0", +"X c #2A5398", +"0 c #B8CCEC", +"s c #376EC9", +"q c #2D5AA5", +"i c #285092", +"k c #8CACE0", /* pixels */ -" ", -" ...... ", -" .XXXXX.. ", -" .XX...oX.. ", -" .X.. .X.. ", -" .X.. .XX.. ", -" .. .XX.. ", -" .XX.. ", -" .X.. ", -" .X.. ", -" .o.. ", -" .. ", -" .XX.. ", -" .XX.. ", -" ... " +" .......Xo ", +" .O+@#$%.&o ", +" .*O+@#$.=&- ", +" ;:::>#@#.==&: ", +" ,<1234<>@....: ", +"5 c #3366BB", +"$ c #2E5CA8", +"9 c #FAFCFE", +"4 c #F5F8FD", +"q c #638ED5", +"o c #5282D0", +"& c #B8CCEC", +"X c #376EC9", +"< c #ACE95B", /* pixels */ -" ", -" ........ ", -" .XXXXXX.. ", -" .XXXXXX.X. ", -" .XXXXXX.... ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" ........... ", -" " +" .XoO+@#$. ", +" .%%&*=-O;: ", +" >>>>%&*=O,=o ", +" ><<>%%&*O,,=o ", +">>><<>>>%&OOo+@ ", +"><<<<<<>1%&*=-@ ", +"><<<<<<>21%&*=@ ", +">>><<>>>321%&*+ ", +" ><<>456321%&O ", +" >>>>7456321%o ", +" .,8974563210 ", +" .,,897456320 ", +" .,,,8974563q ", +" .,,,,897456w ", +" ............ " }; diff --git a/samples/toolbar/bitmaps/open.bmp b/samples/toolbar/bitmaps/open.bmp index bbf93fe033..35ad487487 100644 Binary files a/samples/toolbar/bitmaps/open.bmp and b/samples/toolbar/bitmaps/open.bmp differ diff --git a/samples/toolbar/bitmaps/open.xpm b/samples/toolbar/bitmaps/open.xpm index 54748e910d..36e058fc8e 100644 --- a/samples/toolbar/bitmaps/open.xpm +++ b/samples/toolbar/bitmaps/open.xpm @@ -1,26 +1,57 @@ /* XPM */ static char *open_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 5 1", +"16 15 36 1", +", c #AAC1E8", +"1 c #9AEA53", +"q c #DCE6F6", +". c #295193", +"; c #A9D066", +"r c #C6D6F0", +"$ c #4A7CCE", +"9 c #779DDB", +"8 c #EAF0FA", +"O c #6E96D8", +"X c #214279", +"e c #BED0EE", +"6 c #85A7DF", +"5 c #F0F5FC", +"t c #ADC4E9", +": c #3161B1", " c None", -". c Black", -"X c Yellow", -"o c Gray100", -"O c #bfbf00", +"u c #274D8B", +"& c #BFDC9B", +"> c #9FB9E5", +"y c #5584D1", +"w c #3569BF", +"% c #3A70CA", +"+ c #305FAC", +"3 c #5D89D3", +"0 c #D2DFF4", +"@ c #CAE2AA", +"= c #B2D58C", +"2 c #FAFCFE", +"# c #638ED5", +"* c #CEDCF2", +"4 c #90AFE2", +"< c #B3C8EB", +"7 c #E5EDF9", +"- c #A2BCE6", +"o c #DFF0D0", /* pixels */ " ", -" ... ", -" . . .", -" ..", -" ... ...", -" .XoX....... ", -" .oXoXoXoXo. ", -" .XoXoXoXoX. ", -" .oXoX..........", -" .XoX.OOOOOOOOO.", -" .oo.OOOOOOOOO. ", -" .X.OOOOOOOOO. ", -" ..OOOOOOOOO. ", -" ........... ", +" .... ", +"XXXXX .oo. ", +"XOOOO+ .@o. ", +"XOOOO#$%.&*XXX ", +"XOOOOOOO.=*X-X ", +"XOXXXX...;*XXXX:", +"XOX>,<.11111*X2:", +"X3X4>,<.111*X5-:", +"XX#64>,,.1*X78: ", +"XXO964>,,.X0q7: ", +"Xw3O964>,,er0t: ", +"X%y3O964>, c #D1E5F5", +"o c #6792AE", +"% c #C3DDF1", +"8 c #749BB5", +"; c #619BC4", +"X c #6B97B6", +"@ c #4B82A8", +" c None", +"O c #5F8FB0", +"q c #84A5BB", +": c #71A8D1", +"- c #85BBE2", +"9 c #EFF6FC", +"7 c #F7FBFD", +"6 c #FAFCFE", +"2 c #7FA6C0", +"5 c #C00000", +"0 c #FDFDFE", +"3 c #E2EFF8", +"$ c #8EA9BC", +"& c #B6D5EE", +"* c #A5CCEA", +"4 c #F4F9FD", /* pixels */ -" .......", -" XXXXXXX ......", -" XXXXXXX . .....", -" XXXXXXX ....", -" XXXXXXXXXX ....", -" XXXXXXX ....", -" XXXXXX o..o ...", -" XXXXX oOO.oo ..", -" XXXXX .O..o. ..", -" XXXXX ....o. ..", -" XXXXX o..Ooo ..", -" XXXXXX o..o o..", -" XXXXXXX o .", -" XXXXXXXXXX . ", -" .. " +" ..XoO+@#$ ", +" .%%&*=-;:; ", +" .>>%&*=,<=X ", +" $%%%1112<<=X ", +" $3-1<<<1oXO+ ", +" $314<<<<1=-+ ", +" $31<<<<<1-=+ ", +" $31<<<<<1&*O ", +" $3-1<<<51>%X ", +" $367111551>8 ", +" $3-----95518 ", +" $3<067466551 ", +" $3--------551 ", +" $3<<<0666<<55 ", +" $$$$$$$$$$q$ " }; diff --git a/samples/toolbar/bitmaps/print.bmp b/samples/toolbar/bitmaps/print.bmp index 00319b55bb..8758e136d8 100644 Binary files a/samples/toolbar/bitmaps/print.bmp and b/samples/toolbar/bitmaps/print.bmp differ diff --git a/samples/toolbar/bitmaps/print.xpm b/samples/toolbar/bitmaps/print.xpm index 3c2e2be781..fae8103a9a 100644 --- a/samples/toolbar/bitmaps/print.xpm +++ b/samples/toolbar/bitmaps/print.xpm @@ -1,26 +1,56 @@ /* XPM */ static char *print_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 5 1", +"16 15 35 1", +"y c #EDF2FB", +"9 c #4E7FD0", +"> c #B9CDED", +"# c #3365B7", +"r c #FFFFFF", +"8 c #2C58A0", +"X c #779DDB", +"7 c #7FA2DD", +"t c #3263B4", +"q c #6E96D8", +"= c #6992D7", +"* c #D9E4F5", +"0 c #356AC1", +"& c #CBD9F1", +"; c #97B4E3", +"e c #3161B1", " c None", -". c Black", -"X c Gray100", -"o c #808000", -"O c Yellow", +"1 c #B5C9EB", +", c #7CA0DC", +"4 c #487BCE", +"- c #4377CD", +". c #5584D1", +"6 c #3A70CA", +"2 c #305FAC", +"< c #5685D2", +"w c #4075CC", +"5 c #638ED5", +"3 c #3467BC", +"% c #2F5DA9", +"o c #ECF1FA", +": c #D6E1F4", +"@ c #376EC9", +"$ c #2D5AA5", +"+ c #A2BCE6", +"O c #CFDDF3", /* pixels */ -" ", -" ......... ", -" .XXXXXXXX. ", -" .X.....X. ", -" .XXXXXXXX. ", -" .X.....X.... ", -" .XXXXXXXX. . .", -" .......... . ..", -". . . .", -"............. .", -". ooo . . ", -". OOO ... ", -"............. . ", -" . . . ", -" ........... " +" .XXXXXXXX ", +" .oooooooX ", +" .OOOOOOOX ", +" .+++++++X ", +" @@#$%%%%%$%@@ ", +"#&*=-=;:>,<#*&# ", +".11.2345.63#11. ", +"4;;;;;;;;;;;;;4 ", +"677588888889776 ", +"0qq60wwwwwweqq0 ", +"3553rrrrrrr$553 ", +"3< c #C0D1EE", /* pixels */ -" ", -" .............. ", -" .X. . . ", -" .X. ... ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .XX........oX. ", -" .XXXXXXXXXXXX. ", -" .XX.........X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" ............. " +" .", +" XoOOOOOOOOO+X .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @@+++++++++@@ .", +" @@@@@@@@@@@@@ .", +" @@@$$$$$$$$@@ .", +" @@$%%%&*=-O$@ .", +" @@$%X;;*=-O$@ .", +" @@$%X;;:>,O$@ .", +" @@$%X;;<12O$@ .", +" @@$<<2OOOOO$@ .", +". .." }; diff --git a/samples/treectrl/icon1.xpm b/samples/treectrl/icon1.xpm index 0263fadbaa..fbc605b5fd 100644 --- a/samples/treectrl/icon1.xpm +++ b/samples/treectrl/icon1.xpm @@ -1,41 +1,79 @@ /* XPM */ static char *icon1_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 32 32 2 1", -/* colors */ -". c #000000", -"# c #ffffff", +/* columns rows colors chars-per-pixel */ +"32 32 41 1", +"> c #97C4E7", +"# c #4381AA", +"d c #FFFFFF", +"< c #71B2DE", +"+ c #538BB1", +"& c #D1E5F5", +"q c #63B3DE", +"6 c #F1F4F7", +"* c #CAE1F3", +"y c #7AC4E5", +"= c #C3DDF1", +"X c #74A1BD", +"- c #BCD9EF", +"5 c #619BC4", +"3 c #E6EAF1", +"2 c #4B8EBF", +"o c #6B97B6", +". c #4B82A8", +" c None", +"w c #54A6D8", +"1 c #71A8D1", +", c #85BBE2", +"t c #EFF6FC", +"7 c #DEEDF8", +"@ c #4388B4", +"a c #F7FBFD", +"$ c #D7E0E9", +"r c #FAFCFE", +"4 c #DAEAF7", +"e c #E9F3FA", +"0 c #76BAE2", +"% c #7FA6C0", +"s c #FDFDFE", +"O c #5896BE", +"p c #B6D5EE", +"8 c #87ABC3", +": c #A5CCEA", +"9 c #E5F0F9", +"; c #AFD1EC", +"i c #F4F9FD", +"u c #8FB0C3", /* pixels */ -"################################", -"################################", -"####................############", -"####................############", -"####..############....##########", -"####..############....##########", -"####..##..##..####..##..########", -"####..##..##..####..##..########", -"####..############........######", -"####..############........######", -"####..##..##..##########..######", -"####..##..##..##########..######", -"####..##################..######", -"###...##################..######", -"####..##..##..##..##..##..######", -"####..##..##..##..##..##..######", -"####..##################..######", -"####..##################..######", -"####..##..##..##..##..##..######", -"####..##..##..##..##..##..######", -"####..##################..######", -"####..##################..######", -"####..##..##..##..##..##..######", -"####..##..##..##..##..##..######", -"####..##################..######", -"####..##################..######", -"####......................######", -"####......................######", -"################################", -"################################", -"################################", -"################################" +" ", +" ", +" ", +" ", +" ", +" .XXXooOO++@#$ ", +" %&*=-;:>>,<123 ", +" %4&*=-;:>>,1>56 ", +" %74&*=-;:>>1*>56 ", +" 89700qqqqwq1e*>X ", +" 8e974&*=-;:1re*>8 ", +" 8te974&*=-;11111# ", +" 8tty000qqqqqww>,+ ", +" uitte974&*=-p:>>+ ", +" uaitte974&*=-p:>O ", +" uaayyyy000qqqqp:O ", +" uraaitte974&*=-po ", +" urraaitte974&*=-o ", +" usryyyyyyy000q*=X ", +" ussrraaitte974&*X ", +" udssrraaitte974&X ", +" uddyyyyyyyyyy074% ", +" udddssrraaitte97% ", +" uddddssrraaitte9% ", +" udddddssrraaitte8 ", +" uddddddssrraaitt8 ", +" uuuuuuuuuuuuuu88u ", +" ", +" ", +" ", +" ", +" " }; diff --git a/samples/treectrl/icon2.xpm b/samples/treectrl/icon2.xpm index d3d76ec8e4..7ae8c92cd7 100644 --- a/samples/treectrl/icon2.xpm +++ b/samples/treectrl/icon2.xpm @@ -1,42 +1,53 @@ /* XPM */ static char *icon2_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 32 32 3 1", -/* colors */ -". c #000000", -"# c #ff0000", -"a c None", +/* columns rows colors chars-per-pixel */ +"32 32 15 1", +". c Black", +"O c #97C4E7", +"$ c #63B3DE", +"@ c #CAE1F3", +"; c #7AC4E5", +"* c #74A1BD", +"+ c #619BC4", +"o c #4B8EBF", +" c None", +"% c #54A6D8", +"= c #FAFCFE", +"& c #E9F3FA", +"# c #76BAE2", +"X c #C00000", +"- c #87ABC3", /* pixels */ -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaa................aaaaaaaaaaaa", -"aaaa................aaaaaaaaaaaa", -"aaaa..############....aaaaaaaaaa", -"aaaa..############....aaaaaaaaaa", -"aaaa..##..##..####..aa..aaaaaaaa", -"aaaa..##..##..####..aa..aaaaaaaa", -"aaaa..############........aaaaaa", -"aaaa..############........aaaaaa", -"aaaa..##..##..##########..aaaaaa", -"aaaa..##..##..##########..aaaaaa", -"aaaa..##################..aaaaaa", -"aaaa..##################..aaaaaa", -"aaaa..##..##..##..##..##..aaaaaa", -"aaaa..##..##..##..##..##..aaaaaa", -"aaaa..##################..aaaaaa", -"aaaa..##################..aaaaaa", -"aaaa..##..##..##..##..##..aaaaaa", -"aaaa..##..##..##..##..##..aaaaaa", -"aaaa..##################..aaaaaa", -"aaaa..##################..aaaaaa", -"aaaa..##..##..##..##..##..aaaaaa", -"aaaa..##..##..##..##..##..aaaaaa", -"aaaa..##################..aaaaaa", -"aaaa..##################..aaaaaa", -"aaaa......................aaaaaa", -"aaaa......................aaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +" ", +" ", +" ", +" ", +" ", +" ............. ", +" .XXXXXXXXXX.o. ", +" .XXXXXXXXXX.O+. ", +" .XXXXXXXXXX.@O+. ", +" .XX##$$$$%$.&@O* ", +" .XXXXXXXXXX.=&@O- ", +" .XXXXXXXXXX...... ", +" .XX;###$$$$$%%XX. ", +" .XXXXXXXXXXXXXXX. ", +" .XXXXXXXXXXXXXXX. ", +" .XX;;;;###$$$$XX. ", +" .XXXXXXXXXXXXXXX. ", +" .XXXXXXXXXXXXXXX. ", +" .XX;;;;;;;###$XX. ", +" .XXXXXXXXXXXXXXX. ", +" .XXXXXXXXXXXXXXX. ", +" .XX;;;;;;;;;;#XX. ", +" .XXXXXXXXXXXXXXX. ", +" .XXXXXXXXXXXXXXX. ", +" .XXXXXXXXXXXXXXX. ", +" .XXXXXXXXXXXXXXX. ", +" ................. ", +" ", +" ", +" ", +" ", +" " }; diff --git a/samples/treectrl/icon3.xpm b/samples/treectrl/icon3.xpm index 0dba5bef0d..722de6b1c1 100644 --- a/samples/treectrl/icon3.xpm +++ b/samples/treectrl/icon3.xpm @@ -1,44 +1,79 @@ /* XPM */ static char *icon3_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 32 32 5 1", -/* colors */ -". c #000000", -"# c #c0c0c0", -"a c #808080", -"b c #ffff00", -"c c None", +/* columns rows colors chars-per-pixel */ +"32 32 41 1", +"6 c #EDF2FB", +"- c #AAC1E8", +": c #B9CDED", +"X c #295193", +", c #C6D6F0", +"a c #4A7CCE", +"u c #779DDB", +"y c #7FA2DD", +"$ c #3263B4", +"5 c #EAF0FA", +". c #2D59A3", +"o c #6E96D8", +"* c #356AC1", +"r c #F7F9FD", +"> c #BED0EE", +"3 c #E1E9F7", +"7 c #F0F5FC", +"< c #CBD9F1", +"2 c #DAE5F6", +"# c #3161B1", +" c None", +"0 c #FDFEFF", +"= c #9FB9E5", +"e c #AEC5EA", +"t c #89A9DF", +"q c #98B5E4", +"p c #5584D1", +"d c #3A70CA", +"@ c #305FAC", +"i c #5D89D3", +"1 c #D2DFF4", +"% c #3366B9", +"9 c #FAFCFE", +"8 c #F5F8FD", +"s c #4075CC", +"O c #638ED5", +"w c #90AFE2", +"& c #3467BC", +"+ c #2F5DA9", +"; c #B3C8EB", +"4 c #E5EDF9", /* pixels */ -"cccccccccccccccccccccccccccccccc", -"cccccccccccccccccccccccccccccccc", -"ccccccaaaaaaaaaacccccccccccccccc", -"ccccccaaaaaaaaaacccccccccccccccc", -"ccccaabb##bb##bbaacccccccccccccc", -"ccccaabb##bb##bbaacccccccccccccc", -"ccaabb##bb##bb##bbaaaaaaaaaaaacc", -"ccaabb##bb##bb##bbaaaaaaaaaaaacc", -"ccaaccccccccccccccccccccccccaa..", -"ccaaccccccccccccccccccccccccaa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaaaaaaaaaaaaaaaaaaaaaaaaaaaa..", -"ccaaaaaaaaaaaaaaaaaaaaaaaaaaaa..", -"cccc............................", -"cccc............................", -"cccccccccccccccccccccccccccccccc", -"cccccccccccccccccccccccccccccccc", -"cccccccccccccccccccccccccccccccc", -"cccccccccccccccccccccccccccccccc" +" ", +" ", +" ", +" ", +" ", +" ", +" ......X ", +" .oooooO+ ", +" .ooooooo. ", +" .+@@@##$%%&&&&&****. ", +" .=-;:>,<12345678900. ", +" .q=-;:>,<1234567890. ", +" .wq=-e:>,<12345678r. ", +" .twq=-e:>,<12345678. ", +" .ytwq=-e:>,<1234567. ", +" .uytwq=-e:>,<123456. ", +" .ouytwq=-e:>,<12345. ", +" .Oouytwq=-e;>,<1234. ", +" .iOouytwq=-e;>,<123. ", +" .piOouytwq=-e;>,<12. ", +" .apiOouytwq=-e;>,<1. ", +" .sapiOouytwq=-e;>,<. ", +" .dsapiOouytwq=-e;>,. ", +" ...................# ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" " }; diff --git a/samples/treectrl/icon4.xpm b/samples/treectrl/icon4.xpm index f4cd561639..a18e1a70ea 100644 --- a/samples/treectrl/icon4.xpm +++ b/samples/treectrl/icon4.xpm @@ -1,44 +1,43 @@ /* XPM */ static char *icon4_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 32 32 5 1", -/* colors */ -". c #000000", -"# c #c0c0c0", -"a c #808080", -"b c #ff0000", -"c c #ffffff", +/* columns rows colors chars-per-pixel */ +"32 32 5 1", +". c Black", +"o c #8399B4", +"X c #8DA0B9", +" c None", +"O c #800000", /* pixels */ -"cccccccccccccccccccccccccccccccc", -"cccccccccccccccccccccccccccccccc", -"ccccccaaaaaaaaaacccccccccccccccc", -"ccccccaaaaaaaaaacccccccccccccccc", -"ccccaabb##bb##bbaacccccccccccccc", -"ccccaabb##bb##bbaacccccccccccccc", -"ccaabb##bb##bb##bbaaaaaaaaaaaacc", -"ccaabb##bb##bb##bbaaaaaaaaaaaacc", -"ccaaccccccccccccccccccccccccaa..", -"ccaaccccccccccccccccccccccccaa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaacc##bb##bb##bb##bb##bb##aa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaaccbb##bb##bb##bb##bb##bbaa..", -"ccaaaaaaaaaaaaaaaaaaaaaaaaaaaa..", -"ccaaaaaaaaaaaaaaaaaaaaaaaaaaaa..", -"cccc............................", -"cccc............................", -"cccccccccccccccccccccccccccccccc", -"cccccccccccccccccccccccccccccccc", -"cccccccccccccccccccccccccccccccc", -"cccccccccccccccccccccccccccccccc" +" ", +" ", +" ", +" ", +" ", +" ", +" ....... ", +" .XXXXXo. ", +" .XXXXXXX. ", +" .................... ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .OOOOOOOOOOOOOOOOOO. ", +" .................... ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" " }; diff --git a/samples/treectrl/icon5.xpm b/samples/treectrl/icon5.xpm index 63820ef10f..9f63c31098 100644 --- a/samples/treectrl/icon5.xpm +++ b/samples/treectrl/icon5.xpm @@ -1,43 +1,79 @@ /* XPM */ static char *icon5_xpm[] = { -/* width height num_colors chars_per_pixel */ -" 32 32 4 1", -/* colors */ -". c #000000", -"# c #808000", -"a c None", -"b c #ffff00", +/* columns rows colors chars-per-pixel */ +"32 32 41 1", +"0 c #AAC1E8", +"q c #B9CDED", +"X c #295193", +"e c #C6D6F0", +"a c #4A7CCE", +"& c #779DDB", +"* c #7FA2DD", +"2 c #EAF0FA", +"@ c #2D59A3", +"o c #6E96D8", +"y c #356AC1", +"d c #214279", +"w c #BED0EE", +"= c #85A7DF", +"< c #E1E9F7", +"3 c #F0F5FC", +"s c #CBD9F1", +", c #DAE5F6", +"7 c #3161B1", +" c None", +". c #274D8B", +"6 c #FDFEFF", +"i c #E7EEF9", +"9 c #9FB9E5", +"- c #89A9DF", +"8 c #98B5E4", +"$ c #5584D1", +"+ c #3569BF", +"% c #305FAC", +"O c #5D89D3", +"> c #D2DFF4", +"p c #3366B9", +"5 c #FAFCFE", +"4 c #F5F8FD", +"t c #4075CC", +"u c #638ED5", +"r c #CEDCF2", +"; c #90AFE2", +"# c #2F5DA9", +": c #B3C8EB", +"1 c #E5EDF9", /* pixels */ -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aa..........aaaaaaaaaaaaaaaaaaaa", -"aa..........aaaaaaaaaaaaaaaaaaaa", -"aa..bbbbbb................aaaaaa", -"aa..bbbbbb................aaaaaa", -"aa..bbbbbbbbbbbbbbbbbbbb..aaaaaa", -"aa..bbbbbbbbbbbbbbbbbbbb..aaaaaa", -"aa..bbbbbbbbbbbbbbbbbbbb..aaaaaa", -"aa..bbbbbbbbbbbbbbbbbbbb..aaaaaa", -"aa..bbbb......................aa", -"aa..bbbb......................aa", -"aa..bbb.####################..aa", -"aa..bbb.####################..aa", -"aa..bb..####################.aaa", -"aa..bb..####################.aaa", -"aa..b.####################..aaaa", -"aa..b.####################..aaaa", -"aa....####################.aaaaa", -"aa....####################.aaaaa", -"aa..####################..aaaaaa", -"aa..####################..aaaaaa", -"aa......................aaaaaaaa", -"aa......................aaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ......X ", +" XoooooO. ", +" Xoooooo+. ", +" Xooooooo@XXXXXXXXXX# ", +" Xoooooooooooooooooo# ", +" Xoooooooooooooooooo# ", +" Xoo$################### ", +" Xoo%O&*=-;:>,<123445667 ", +" XooX890:qwer>,<123445q# ", +" Xoty;890:qwer>,<12344# ", +" Xo%u-;890:qwer>,,,,<# ", +" XX$Ouo&*-;890:qwer>s# ", +" d%a$Ouo&*-;890:qwer# ", +" d+ta$Ouo&*-;890:qwe# ", +" d..................# ", +" ", +" ", +" ", +" ", +" ", +" ", +" " }; diff --git a/samples/xrc/rc/fileopen.gif b/samples/xrc/rc/fileopen.gif index a93ef2aab7..bc51b401b9 100644 Binary files a/samples/xrc/rc/fileopen.gif and b/samples/xrc/rc/fileopen.gif differ diff --git a/samples/xrc/rc/filesave.gif b/samples/xrc/rc/filesave.gif index 7bd11de000..6dd1fd98b5 100644 Binary files a/samples/xrc/rc/filesave.gif and b/samples/xrc/rc/filesave.gif differ diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index d70532509a..c8ec6ca41e 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -96,226 +96,562 @@ #endif /* Closed folder */ +/* Copyright (c) Julian Smart */ static const char * icon1_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 6 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffff00", -"$ c #ffffff", +/* columns rows colors chars-per-pixel */ +"16 16 112 2", +"r c #F7FAFD", +"%. c #3562AF", +"=. c #3F6AB2", +"- c #4975BE", +"O. c #A5BDE6", +"k c #446EB4", +"d c #B9CDEC", +"5 c #AFC5EA", +"@ c #6790D4", +".. c #769CDA", +"M c #6787BD", +"D c #CDDAF1", +"F c #D7E2F5", +"] c #99B5E4", +"% c #4772B8", +";. c #476FB3", +">. c #4C73B5", +"@. c #5B7FBA", +"` c #4F80CF", +"*. c #3B67B0", +"O c #406BB2", +"N c #406BB3", +"R c #6891D6", +"j c #6888BD", +"( c #D8E3F5", +"$ c #3460A9", +"& c #4873BA", +"' c #5C89D3", +"-. c #436CB2", +"u c #4870B4", +"[ c #B8CBEC", +"7 c #C2D3EF", +"H c #3C68B1", +"a c #A2BBE6", +"+ c #6E96D8", +": c #698FCE", +"9 c #D4E0F4", +"t c #FCFDFE", +":. c #4971B4", +"3 c #4E75B6", +"< c #6C93D1", +"6 c #B9CCEC", +"c c #C3D4EF", +"l c #80A3DD", +"| c #4276CC", +"q c #E6EDF9", +"e c #F0F5FC", +"#. c #2E5AA6", +"x c #A3BCE6", +"s c #ADC4E9", +"B c #749BDA", +"1. c #567AB7", +", c #6A90D0", +"# c #6589C5", +"G c #6586BD", +"8 c #CBD9F1", +"g c #D5E1F4", +"z c #8DACE0", +"p c #97B4E3", +" c None", +"* c #4A75BC", +"+. c #C4D5EF", +"V c #81A4DD", +"m c #ECF2FA", +"n c #E7EEF9", +"Y c #3966B1", +"Z c #A4BDE6", +"A c #AEC5E9", +"o c #436BAD", +"T c #5C88D2", +"J c #6690D5", +"<. c #5277B6", +") c #6183BC", +"f c #CCDAF1", +"v c #D6E2F5", +"o. c #98B5E3", +"Q c #8EADE1", +" . c #5080CF", +"= c #4B76BE", +"I c #B6CAEC", +"S c #BBCEED", +"_ c #3563AF", +"! c #A5BEE6", +"/ c #CDDBF2", +"X. c #8FAEE1", +"0 c #DFE8F7", +"$. c #3160AE", +"} c #3160AF", +"4 c #A1BBE5", +"1 c #6D93D1", +"{ c #5E81BB", +"U c #6385BC", +"^ c #C4D4EF", +"2 c #597DBC", +"K c #81A3DD", +"i c #8BABE0", +"w c #ECF1FA", +"h c #F1F5FC", +"&. c #3965B0", +"X c #3E69B1", +"P c #AEC4E9", +"~ c #B8CCEC", +"; c #5C84C6", +"E c #759BDA", +"y c #6B8ABE", +"b c #E0E9F7", +"C c #98B4E3", +". c #325EA7", +"> c #6990CE", +",. c #5076B6", +"W c #82A4DD", +"L c #8CACE0", /* pixels */ -" ", -" @@@@@ ", -" @#+#+#@ ", -" @#+#+#+#@@@@@@ ", -" @$$$$$$$$$$$$@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @$+#+#+#+#+#+@.", -" @$#+#+#+#+#+#@.", -" @@@@@@@@@@@@@@.", -" ..............", -" ", -" "}; +" ", +" ", +" . X X X o ", +" O + + + @ # ", +" $ % & * = - ; : : > , < 1 2 ", +" 3 4 5 6 7 8 9 0 q w e r t y ", +" u i p a s d 7 f g 0 q w h j ", +" k l z p x 5 6 c f v b n m M ", +" N B V z C Z A S c D F b n G ", +" H J B K L C x P I c f v b U ", +" Y T R E W Q C ! P ~ ^ / ( ) ", +" _ ` ' R E W z ] Z P [ ^ / { ", +" } | .' R ..V X.o.O.P [ +.@. ", +" #.$.%.&.*.=.-.;.:.>.,.<.1.*. ", +" ", +" " +}; /* Open folder */ +/* Copyright (c) Julian Smart */ static const char * icon2_xpm[] = { -/* width height ncolors chars_per_pixel */ -"16 16 6 1", -/* colors */ -" s None c None", -". c #000000", -"+ c #c0c0c0", -"@ c #808080", -"# c #ffff00", -"$ c #ffffff", +/* columns rows colors chars-per-pixel */ +"16 16 57 1", +"u c #83A5DD", +"h c #83A5DE", +"> c #DAE3F2", +": c #F3F7FC", +"t c #4A79C6", +"s c #274E8F", +"n c #4D71AB", +"5 c #C2D0E8", +"9 c #84A6DE", +"x c #3761A5", +"p c #ACC3E8", +"$ c #ACC3E9", +"= c #D9E4F5", +"o c #91AFE2", +"f c #5886D1", +"2 c #B9CCEC", +"& c #C3D4EF", +"; c #EBF1FA", +"7 c #4270BC", +"# c #9EB8E5", +"0 c #ADC4E9", +"y c #658FD5", +" c None", +"@ c #688DCA", +"< c #779CDA", +"r c #2A5498", +"l c #254A87", +"g c #6690D5", +"M c #5778AE", +"m c #5274AD", +"a c #D6E2F4", +", c #4672BA", +"v c #4168A8", +"c c #3C64A7", +". c #416BB2", +"- c #E3EBF8", +"z c #305CA3", +"X c #446CAE", +"O c #5882C8", +"N c #5D7DB0", +"3 c #C3D3EF", +"b c #476DAA", +"k c #ADC3E9", +"e c #E4ECF8", +"d c #4576C7", +"q c #C4D4EF", +"* c #CEDCF2", +"i c #90AFE1", +"4 c #ECF1FA", +"B c #4D72AE", +"% c #B8CCEC", +"8 c #759BDA", +"+ c #617FB1", +"1 c #9DB8E4", +"j c #9DB8E5", +"6 c #3762AA", +"w c #CFDDF2", /* pixels */ " ", -" @@@@@ ", -" @$$$$$@ ", -" @$#+#+#$@@@@@@ ", -" @$+#+#+$$$$$$@.", -" @$#+#+#+#+#+#@.", -"@@@@@@@@@@@@@#@.", -"@$$$$$$$$$$@@+@.", -"@$#+#+#+#+##.@@.", -" @$#+#+#+#+#+.@.", -" @$+#+#+#+#+#.@.", -" @$+#+#+#+##@..", -" @@@@@@@@@@@@@.", -" .............", " ", -" "}; +" ", +" .... ", +" Xooo. ", +" Xoooo....... ", +" Xoooooooooo. ", +" XoOOOOOOOOOOO+ ", +" Xo@#$%&*=-;:>+ ", +" X, c #D2DFF4", +"# c #2E5CA8", +"7 c #FAFCFE", +"4 c #F5F8FD", +", c #638ED5", +"X c #5282D0", +"& c #B8CCEC", +". c #376EC9", /* pixels */ -" ", -" ........ ", -" .++++++.. ", -" .+.+.++.+. ", -" .++++++.... ", -" .+.+.+++++. ", -" .+++++++++. ", -" .+.+.+.+.+. ", -" .+++++++++. ", -" .+.+.+.+.+. ", -" .+++++++++. ", -" .+.+.+.+.+. ", -" .+++++++++. ", -" ........... ", -" ", -" "}; +" ..XoO+@#$ ", +" .%%&*=-;:; ", +" .>>%&*=,<=X ", +" $%%%%&*1<<=X ", +" $2-----,oXO+ ", +" $2345>%&*=-+ ", +" $2--------=+ ", +" $244625>%&*O ", +" $2--------&o ", +" $27348625>%X ", +" $2-------->9 ", +" $2<073486259 ", +" $2--------2, ", +" $2<<<0734861 ", +" $$$$$$$$$$1$ ", +" " +}; /* Computer */ +/* Copyright (c) Julian Smart */ static const char * icon4_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c #008080", -"@ c Blue", -" ........... ", -" .XXXXXXXXXX.o", -" .OOOOOOOOO..o", -" .OoooooooX..o", -" .Oo+...@+X..o", -" .Oo+XXX.+X..o", -" .Oo+....+X..o", -" .Oo++++++X..o", -" .OXXXXXXXX.oo", -" ..........o.o", -" ...........Xo", -" .XXXXXXXXXX.o", -" .o.o.o.o.o...o", -" .oXoXoXoXoXo.o ", -".XOXXXXXXXXX.o ", -"............o "}; +/* columns rows colors chars-per-pixel */ +"16 16 42 1", +"r c #4E7FD0", +"$ c #7198D9", +"; c #DCE6F6", +"q c #FFFFFF", +"u c #4A7CCE", +"# c #779DDB", +"w c #95B2E3", +"y c #7FA2DD", +"f c #3263B4", +"= c #EAF0FA", +"< c #B1C7EB", +"% c #6992D7", +"9 c #D9E4F5", +"o c #9BB7E5", +"6 c #F7F9FD", +", c #BED0EE", +"3 c #F0F5FC", +"1 c #A8C0E8", +" c None", +"0 c #FDFEFF", +"4 c #C4D5F0", +"@ c #81A4DD", +"e c #4377CD", +"- c #E2EAF8", +"i c #9FB9E5", +"> c #CCDAF2", +"+ c #89A9DF", +"s c #5584D1", +"t c #5D89D3", +": c #D2DFF4", +"5 c #FAFCFE", +"2 c #F5F8FD", +"8 c #DFE8F7", +"& c #5E8AD4", +"X c #638ED5", +"a c #CEDCF2", +"p c #90AFE2", +"d c #2F5DA9", +"* c #5282D0", +"7 c #E5EDF9", +". c #A2BCE6", +"O c #8CACE0", +/* pixels */ +" ", +" .XXXXXXXXXXX ", +" oXO++@#$%&*X ", +" oX=-;:>,<1%X ", +" oX23=-;:4,$X ", +" oX5633789:@X ", +" oX05623=78+X ", +" oXqq05623=OX ", +" oX,,,,,<<<$X ", +" wXXXXXXXXXXe ", +" XrtX%$$y@+O,, ", +" uyiiiiiiiii@< ", +" ouiiiiiiiiiip c #3161B1", +" c None", +"- c #B5C9EB", +"X c #487BCE", +", c #3A70CA", +": c #3569BF", +"q c #305FAC", +"8 c #A5BEE7", +"< c #5D89D3", +"4 c #D2DFF4", +". c #3366B9", +"+ c #4075CC", +"2 c #638ED5", +"# c #3467BC", +"t c #2F5DA9", +"5 c #D6E1F4", +"u c #070D17", +"w c #A2BCE6", +"& c #CFDDF3", +/* pixels */ " ", -" ", -" ", -" ", -" ............. ", -" .XXXXXXXXXXXX.o", -".OOOOOOOOOOOO..o", -".XXXXXXXXX+@X..o", -".XXXXXXXXXXXX..o", -".X..........X..o", -".XOOOOOOOOOOX..o", -"..............o ", -" ooooooooooooo ", -" ", -" ", -" "}; +" .XoooXO+@ ", +" #$$%%%%$$$X ", +" #$&**=-$$$# ", +" #;;=+o:>,<1o2 ", +" #33+45--56,1, ", +" #1o17&89&70q1. ", +"##1+17&oo&70o1. ", +"#1%wo45--56,e%1.", +"#11146wwww61111o", +"r>>>>>>>>>>>>>>t", +">**>;;;;;;;;;;;>", +">**>;;;;;;;;yu;>", +"i**#;;;;;;;;;;;>", +">>>>>>>>>>>>>>>>", +" " +}; /* CD-ROM */ +/* Copyright (c) Julian Smart */ static const char *icon6_xpm[] = { -"16 16 10 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Yellow", -"O c Blue", -"+ c Black", -"@ c Gray100", -"# c #008080", -"$ c Green", -"% c #008000", -" ... ", -" ..XoX.. ", -" .O.XoXXX+ ", -" ...O.oXXXX+ ", -" .O..X.XXXX+ ", -" ....X.+..XXX+", -" .XXX.+@+.XXX+", -" .X@XX.+.X@@X+", -" .....X...#XX@+ ", -".@@@...XXo.O@X+ ", -".@XXX..XXoXOO+ ", -".@++++..XoX+++ ", -".@$%@@XX+++X.+ ", -".............+ ", -" ++++++++++++ ", -" "}; +/* columns rows colors chars-per-pixel */ +"16 16 35 1", +"$ c #EDF2FB", +"O c #4E7FD0", +". c #7198D9", +"q c #DCE6F6", +"y c #2E5BA6", +"# c #FFFFFF", +"& c #7FA2DD", +"6 c #B1C7EB", +"X c #356AC1", +"* c #9BB7E5", +"; c #85A7DF", +"1 c #ADC4E9", +"9 c #CBD9F1", +"3 c #3161B1", +" c None", +"- c #487BCE", +": c #9FB9E5", +"4 c #AEC5EA", +"7 c #89A9DF", +"@ c #98B5E4", +"8 c #5584D1", +"r c #3569BF", +"% c #3A70CA", +"t c #305FAC", +", c #5D89D3", +"w c #D2DFF4", +"o c #3366B9", +"e c #A6BFE8", +"+ c #638ED5", +"2 c #90AFE2", +"0 c #3467BC", +"< c #2F5DA9", +"> c #B3C8EB", +"= c #A2BCE6", +"5 c #8CACE0", +/* pixels */ +" .XooOo ", +" X+@###$o ", +" %&*=#####o ", +" O@=*######- ", +" o;:>*,<,#1*o ", +" o2:**<#<11*% ", +" o;**#,3,14*X ", +" o5#####16=7% ", +" X$####1=*X ", +" 8%9###*7X0o ", +" Xqw+O33X3,&,o ", +" Xe61e:11111,,%3", +" rr000oo333tyyyo", +" r:###########:o", +" XXXr000oo333tty", +" " +}; /* Floppy */ +/* Copyright (c) Julian Smart */ static const char * icon7_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c Gray100", -"o c #c0c0c0", -"O c Black", -"+ c Cyan", -"@ c Red", -" ......X", -" .ooooooO", -" .+++++OO", -" .++++++O", -" .++++++O", -" .ooooooO", -" .......o....oO", -" .oooooo.o.O.XoO", -".XXXXXXXXOOOOOO ", -".ooooooooo@o..O ", -".ooo....oooo..O ", -".o..OOOO...o..O ", -".oooXXXXoooo..O ", -".............O ", -" OOOOOOOOOOOO ", -" "}; +/* columns rows colors chars-per-pixel */ +"16 16 17 1", +": c #DCE6F6", +"+ c #FFFFFF", +"= c #C6D6F0", +"> c #2C58A0", +". c #2D59A3", +"- c #284F90", +"; c #2B569D", +"O c #214279", +"$ c #1C3866", +"# c #BED0EE", +" c None", +"X c #162C50", +"@ c #638ED5", +"o c #3467BC", +"& c #D6E1F4", +"% c #3C72CA", +"* c #87A8DF", +/* pixels */ +" .XoooooooXO ", +" .o+++++++.O ", +" .o+OOOOO+.O ", +" .o+++++++.O ", +" .o@@@@@@@.O ", +" ..........O ", +" ..#+++++#.O ", +" ..+$O+++#.O ", +" ..+$O+++#.O ", +" %&.........*% ", +" %=+++++++++++&%", +" --------------;", +" -:::::::::::::-", +" -:X:XXXXXXXXX:>", +" ---------------", +" " +}; -/* Removeable */ +/* Removeable (same as drive for now) */ +/* Copyright (c) Julian Smart */ static const char * icon8_xpm[] = { -"16 16 7 1", -" s None c None", -". c #808080", -"X c #c0c0c0", -"o c Black", -"O c Gray100", -"+ c Red", -"@ c #800000", +/* columns rows colors chars-per-pixel */ +"16 16 37 1", +"o c #4E7FD0", +"= c #B9CDED", +"0 c #DCE6F6", +"@ c #295193", +"1 c #FFFFFF", +"* c #C6D6F0", +"O c #4A7CCE", +"e c #B0C6EA", +"3 c #95B2E3", +"r c #2D59A3", +"6 c #B1C7EB", +"$ c #D9E4F5", +"i c #3060AE", +"y c #264C8A", +"% c #214279", +"; c #E1E9F7", +"7 c #F0F5FC", +"9 c #A8C0E8", +"> c #3161B1", +" c None", +"- c #B5C9EB", +"X c #487BCE", +", c #3A70CA", +": c #3569BF", +"q c #305FAC", +"8 c #A5BEE7", +"< c #5D89D3", +"4 c #D2DFF4", +". c #3366B9", +"+ c #4075CC", +"2 c #638ED5", +"# c #3467BC", +"t c #2F5DA9", +"5 c #D6E1F4", +"u c #070D17", +"w c #A2BCE6", +"& c #CFDDF3", +/* pixels */ " ", -" ", -" ", -" ............. ", -" .XXXXXXXXXXXX.o", -".OOOOOOOOOOOO..o", -".OXXXXXXXXXXX..o", -".O+@.oooooo.X..o", -".OXXOooooooOX..o", -".OXXXOOOOOOXX..o", -".OXXXXXXXXXXX..o", -".O............o ", -" ooooooooooooo ", -" ", -" ", -" "}; +" .XoooXO+@ ", +" #$$%%%%$$$X ", +" #$&**=-$$$# ", +" #;;=+o:>,<1o2 ", +" #33+45--56,1, ", +" #1o17&89&70q1. ", +"##1+17&oo&70o1. ", +"#1%wo45--56,e%1.", +"#11146wwww61111o", +"r>>>>>>>>>>>>>>t", +">**>;;;;;;;;;;;>", +">**>;;;;;;;;yu;>", +"i**#;;;;;;;;;;;>", +">>>>>>>>>>>>>>>>", +" " +}; #if defined(__DOS__) diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index b9be27e1b6..0b99eff1dd 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -345,7 +345,7 @@ wxCursor::wxCursor(int cursor_type) } case wxCURSOR_SIZING: { - refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_SIZING")); + refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_SIZEALL); break; } case wxCURSOR_WATCH: diff --git a/utils/dialoged/docs/books.bmp b/utils/dialoged/docs/books.bmp deleted file mode 100644 index cf1e148734..0000000000 Binary files a/utils/dialoged/docs/books.bmp and /dev/null differ diff --git a/utils/dialoged/docs/books.gif b/utils/dialoged/docs/books.gif deleted file mode 100644 index 83f0742f96..0000000000 Binary files a/utils/dialoged/docs/books.gif and /dev/null differ diff --git a/utils/dialoged/docs/load.bmp b/utils/dialoged/docs/load.bmp index 1c38e97b59..35ad487487 100644 Binary files a/utils/dialoged/docs/load.bmp and b/utils/dialoged/docs/load.bmp differ diff --git a/utils/dialoged/docs/load.gif b/utils/dialoged/docs/load.gif index 1ae4cecc50..bc51b401b9 100644 Binary files a/utils/dialoged/docs/load.gif and b/utils/dialoged/docs/load.gif differ diff --git a/utils/dialoged/docs/new.bmp b/utils/dialoged/docs/new.bmp index d66feb2384..92aeb12e7c 100644 Binary files a/utils/dialoged/docs/new.bmp and b/utils/dialoged/docs/new.bmp differ diff --git a/utils/dialoged/docs/new.gif b/utils/dialoged/docs/new.gif index 3b1fd4c6db..82e886af7d 100644 Binary files a/utils/dialoged/docs/new.gif and b/utils/dialoged/docs/new.gif differ diff --git a/utils/dialoged/docs/open.bmp b/utils/dialoged/docs/open.bmp index 9d90ab6fd0..35ad487487 100644 Binary files a/utils/dialoged/docs/open.bmp and b/utils/dialoged/docs/open.bmp differ diff --git a/utils/dialoged/docs/open.gif b/utils/dialoged/docs/open.gif index 9f2e6503db..bc51b401b9 100644 Binary files a/utils/dialoged/docs/open.gif and b/utils/dialoged/docs/open.gif differ diff --git a/utils/dialoged/docs/save.bmp b/utils/dialoged/docs/save.bmp index 545671fa17..2da2da72ad 100644 Binary files a/utils/dialoged/docs/save.bmp and b/utils/dialoged/docs/save.bmp differ diff --git a/utils/dialoged/docs/save.gif b/utils/dialoged/docs/save.gif index 3a031950e5..6dd1fd98b5 100644 Binary files a/utils/dialoged/docs/save.gif and b/utils/dialoged/docs/save.gif differ diff --git a/utils/dialoged/docs/tex2rtf.ini b/utils/dialoged/docs/tex2rtf.ini index fae9a56f09..7498708bfa 100644 --- a/utils/dialoged/docs/tex2rtf.ini +++ b/utils/dialoged/docs/tex2rtf.ini @@ -20,7 +20,7 @@ winHelpTitle = "Dialog Editor Manual" htmlWorkshopFiles = true htmlIndex = true truncateFilenames = yes -\overview [2] { \sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}} +\overview [2] {\helpref{#1}{#2}} \htmlonly{\image{}{books.gif}}\helpref{#1}{#2} \sethotspotcolour{on}\sethotspotunderline{on}} \icon [2] {\xlpignore{\image{2cm;0cm}{#1}}\xlponly{#2}} diff --git a/utils/dialoged/src/bitmaps/help.bmp b/utils/dialoged/src/bitmaps/help.bmp index 54d5aa4b56..d5636e9aa2 100644 Binary files a/utils/dialoged/src/bitmaps/help.bmp and b/utils/dialoged/src/bitmaps/help.bmp differ diff --git a/utils/dialoged/src/bitmaps/help.xpm b/utils/dialoged/src/bitmaps/help.xpm index 27a87ebb31..161b6b2658 100644 --- a/utils/dialoged/src/bitmaps/help.xpm +++ b/utils/dialoged/src/bitmaps/help.xpm @@ -1,24 +1,71 @@ /* XPM */ static char *help_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 3 1", +"16 15 50 1", +"j c #4E7FD0", +"8 c #EDF2FB", +", c #7198D9", +"e c #DCE6F6", +"y c #FFFFFF", +"5 c #95B2E3", +"$ c #9AB6E4", +"g c #EAF0FA", +"1 c #2D59A3", +"@ c #B1C7EB", +"> c #6992D7", +"a c #D9E4F5", +"r c #356AC1", +"6 c #9BB7E5", +"= c #F7F9FD", +"+ c #BED0EE", +"z c #F0F5FC", +"f c #ADC4E9", +"# c #A8C0E8", +"7 c #CBD9F1", +"u c #366BC2", " c None", -". c Black", -"X c #008080", +"c c #FDFEFF", +"w c #274D8D", +"t c #C4D5F0", +"% c #7CA0DC", +"h c #E2EAF8", +"p c #487BCE", +"o c #4377CD", +"4 c #2A549A", +"< c #254A87", +"O c #CCDAF2", +"& c #89A9DF", +"9 c #2B559B", +"* c #D2DFF4", +". c #3366BB", +": c #2E5CA8", +"x c #FAFCFE", +"l c #F5F8FD", +"2 c #799EDB", +"d c #DFE8F7", +"; c #A6BFE8", +"3 c #638ED5", +"- c #5282D0", +"X c #2A5398", +"0 c #B8CCEC", +"s c #376EC9", +"q c #2D5AA5", +"i c #285092", +"k c #8CACE0", /* pixels */ -" ", -" ...... ", -" .XXXXX.. ", -" .XX...XX.. ", -" .X.. .X.. ", -" .X.. .XX.. ", -" .. .XX.. ", -" .XX.. ", -" .X.. ", -" .X.. ", -" .X.. ", -" .. ", -" .XX.. ", -" .XX.. ", -" ... " +" .......Xo ", +" .O+@#$%.&o ", +" .*O+@#$.=&- ", +" ;:::>#@#.==&: ", +" ,<1234<>@....: ", +"5 c #3366BB", +"$ c #2E5CA8", +"9 c #FAFCFE", +"4 c #F5F8FD", +"q c #638ED5", +"o c #5282D0", +"& c #B8CCEC", +"X c #376EC9", +"< c #ACE95B", /* pixels */ -" ", -" ........ ", -" .XXXXXX.. ", -" .XXXXXX.X. ", -" .XXXXXX.... ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" ........... ", -" " +" .XoO+@#$. ", +" .%%&*=-O;: ", +" >>>>%&*=O,=o ", +" ><<>%%&*O,,=o ", +">>><<>>>%&OOo+@ ", +"><<<<<<>1%&*=-@ ", +"><<<<<<>21%&*=@ ", +">>><<>>>321%&*+ ", +" ><<>456321%&O ", +" >>>>7456321%o ", +" .,8974563210 ", +" .,,897456320 ", +" .,,,8974563q ", +" .,,,,897456w ", +" ............ " }; diff --git a/utils/dialoged/src/bitmaps/open.bmp b/utils/dialoged/src/bitmaps/open.bmp index 9d90ab6fd0..35ad487487 100644 Binary files a/utils/dialoged/src/bitmaps/open.bmp and b/utils/dialoged/src/bitmaps/open.bmp differ diff --git a/utils/dialoged/src/bitmaps/save.bmp b/utils/dialoged/src/bitmaps/save.bmp index 545671fa17..2da2da72ad 100644 Binary files a/utils/dialoged/src/bitmaps/save.bmp and b/utils/dialoged/src/bitmaps/save.bmp differ diff --git a/utils/dialoged/src/bitmaps/save.xpm b/utils/dialoged/src/bitmaps/save.xpm index 01b18f9340..accf1f9eb2 100644 --- a/utils/dialoged/src/bitmaps/save.xpm +++ b/utils/dialoged/src/bitmaps/save.xpm @@ -1,25 +1,42 @@ /* XPM */ static char *save_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 15 4 1", -" c None", -". c Black", -"X c #808000", -"o c #808080", +"16 15 21 1", +": c #AAC1E8", +"1 c #B9CDED", +"O c #FFFFFF", +" c #2C58A0", +"* c #B0C6EA", +"; c #2D59A3", +"X c #1C3866", +"= c #C3D4EF", +"2 c #CBD9F1", +"- c #DAE5F6", +"# c #97B4E3", +". c None", +"$ c #274D8B", +"& c #9FB9E5", +"@ c #5584D1", +"% c #82A5DE", +"o c #3A70CA", +"< c #A5BEE7", +", c #D2DFF4", +"+ c #3467BC", +"> c #C0D1EE", /* pixels */ -" ", -" .............. ", -" .X. . . ", -" .X. ... ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .X. .X. ", -" .XX........oX. ", -" .XXXXXXXXXXXX. ", -" .XX.........X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" .XX...... .X. ", -" ............. " +" .", +" XoOOOOOOOOO+X .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @oO#######O+@ .", +" @oOOOOOOOOO+@ .", +" @@+++++++++@@ .", +" @@@@@@@@@@@@@ .", +" @@@$$$$$$$$@@ .", +" @@$%%%&*=-O$@ .", +" @@$%X;;*=-O$@ .", +" @@$%X;;:>,O$@ .", +" @@$%X;;<12O$@ .", +" @@$<<2OOOOO$@ .", +". .." }; diff --git a/utils/helpview/src/bitmaps/helpopen.xpm b/utils/helpview/src/bitmaps/helpopen.xpm index 13e355027d..70572e95ab 100644 --- a/utils/helpview/src/bitmaps/helpopen.xpm +++ b/utils/helpview/src/bitmaps/helpopen.xpm @@ -1,22 +1,57 @@ -/* XPM */ -static char * helpopen_xpm[] = { -"16 15 4 1", -" c None", -". c Black", -"X c Gray100", -"o c #848484", -" ", -" ", -" ", -" ... ", -" .XXX....... ", -" .XXXXXXXXX. ", -" .XXXXXXXXX. ", -" .XXXX..........", -" .XXX.ooooooooo.", -" .XX.ooooooooo. ", -" .X.ooooooooo. ", -" ..ooooooooo. ", -" ........... ", -" ", -" "}; +/* XPM */ +static char *helpopen_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 15 36 1", +", c #AAC1E8", +"1 c #9AEA53", +"q c #DCE6F6", +". c #295193", +"; c #A9D066", +"r c #C6D6F0", +"$ c #4A7CCE", +"9 c #779DDB", +"8 c #EAF0FA", +"O c #6E96D8", +"X c #214279", +"e c #BED0EE", +"6 c #85A7DF", +"5 c #F0F5FC", +"t c #ADC4E9", +": c #3161B1", +" c None", +"u c #274D8B", +"& c #BFDC9B", +"> c #9FB9E5", +"y c #5584D1", +"w c #3569BF", +"% c #3A70CA", +"+ c #305FAC", +"3 c #5D89D3", +"0 c #D2DFF4", +"@ c #CAE2AA", +"= c #B2D58C", +"2 c #FAFCFE", +"# c #638ED5", +"* c #CEDCF2", +"4 c #90AFE2", +"< c #B3C8EB", +"7 c #E5EDF9", +"- c #A2BCE6", +"o c #DFF0D0", +/* pixels */ +" ", +" .... ", +"XXXXX .oo. ", +"XOOOO+ .@o. ", +"XOOOO#$%.&*XXX ", +"XOOOOOOO.=*X-X ", +"XOXXXX...;*XXXX:", +"XOX>,<.11111*X2:", +"X3X4>,<.111*X5-:", +"XX#64>,,.1*X78: ", +"XXO964>,,.X0q7: ", +"Xw3O964>,,er0t: ", +"X%y3O964>,