]> git.sesse.net Git - vlc/commitdiff
fix images, don't rescale them
authorClément Stenac <zorglub@videolan.org>
Sat, 6 Nov 2004 13:43:36 +0000 (13:43 +0000)
committerClément Stenac <zorglub@videolan.org>
Sat, 6 Nov 2004 13:43:36 +0000 (13:43 +0000)
modules/gui/wxwindows/bitmaps/type_directory.xpm
modules/gui/wxwindows/bitmaps/type_disc.xpm
modules/gui/wxwindows/bitmaps/type_unknown.xpm
modules/gui/wxwindows/playlist.cpp

index 4226ee77979f95cc2f8d6047310cd3252bac036f..222384aac83d0732c60d01c847bbbd723e72bc12 100644 (file)
@@ -1,39 +1,23 @@
 /* XPM */
 static char * type_directory_xpm[] = {
-"32 32 4 1",
+"16 16 4 1",
 "      c None",
 ".     c #000000",
 "+     c #FFFF00",
 "@     c #808000",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"  ..........                    ",
-"  ..........                    ",
-"  ..++++++................      ",
-"  ..++++++................      ",
-"  ..++++++++++++++++++++..      ",
-"  ..++++++++++++++++++++..      ",
-"  ..++++++++++++++++++++..      ",
-"  ..++++++++++++++++++++..      ",
-"  ..++++......................  ",
-"  ..++++......................  ",
-"  ..+++.@@@@@@@@@@@@@@@@@@@@..  ",
-"  ..+++.@@@@@@@@@@@@@@@@@@@@..  ",
-"  ..++..@@@@@@@@@@@@@@@@@@@@.   ",
-"  ..++..@@@@@@@@@@@@@@@@@@@@.   ",
-"  ..+.@@@@@@@@@@@@@@@@@@@@..    ",
-"  ..+.@@@@@@@@@@@@@@@@@@@@..    ",
-"  ....@@@@@@@@@@@@@@@@@@@@.     ",
-"  ....@@@@@@@@@@@@@@@@@@@@.     ",
-"  ..@@@@@@@@@@@@@@@@@@@@..      ",
-"  ..@@@@@@@@@@@@@@@@@@@@..      ",
-"  ......................        ",
-"  ......................        ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
+"                ",
+"                ",
+" .....          ",
+" .+++........   ",
+" .++++++++++.   ",
+" .++++++++++.   ",
+" .++........... ",
+" .+@@@@@@@@@@@. ",
+" .+.@@@@@@@@@@. ",
+" .@@@@@@@@@@@.  ",
+" ..@@@@@@@@@@.  ",
+" .@@@@@@@@@@.   ",
+" ...........    ",
+"                ",
+"                ",
+"                "};
index 1bda6484fcc29411f9915c7262444cd0c11eb6b8..2067d16376a3a047434785517aff72eda7aad2da 100644 (file)
@@ -1,10 +1,10 @@
 /* XPM */
 static char * type_disc_xpm[] = {
-"17 16 154 2",
-"      c #FFFFFF",
-".     c #BEB2CA",
-"+     c #B8A7C8",
-"@     c #B8A6CA",
+"16 16 144 2",
+"      c None",
+".     c #FFFFFF",
+"+     c #BEB2CA",
+"@     c #B8A7C8",
 "#     c #AF99C3",
 "$     c #B19CC5",
 "%     c #BEAECD",
@@ -13,161 +13,151 @@ static char * type_disc_xpm[] = {
 "=     c #BDADCF",
 "-     c #D6C9E2",
 ";     c #D9CDE5",
-">     c #D7CBE3",
-",     c #D5C7E2",
-"'     c #E1D4EC",
-")     c #ECE3F4",
-"!     c #F4F0F8",
-"~     c #CFC3DA",
-"{     c #CEC7D4",
-"]     c #C8BED2",
-"^     c #CDBFDB",
-"/     c #DED4E8",
-"(     c #DCD1E7",
-"_     c #DACEE5",
-":     c #E4D7EE",
-"<     c #F4EEF8",
-"[     c #FAF9FC",
-"}     c #F9F8FB",
-"|     c #E2DAE9",
-"1     c #C7C0CF",
-"2     c #E5E2E9",
-"3     c #D2C5DE",
-"4     c #E1D8EB",
-"5     c #DFD5E9",
-"6     c #D5C8E2",
-"7     c #E8DDF1",
-"8     c #F8F6FB",
-"9     c #F9F8FC",
-"0     c #D9CEE3",
-"a     c #C8C2CF",
-"b     c #C8BBD6",
-"c     c #E3D9EB",
-"d     c #E2D9EB",
-"e     c #D7CAE3",
-"f     c #D6C9E3",
-"g     c #EFE6F5",
-"h     c #F9F6FB",
-"i     c #F0E9F6",
-"j     c #E5D8EF",
-"k     c #AE9CBF",
-"l     c #D9D4DE",
-"m     c #D7CCE3",
-"n     c #E4DCED",
-"o     c #D4C6E1",
-"p     c #C8B7D8",
-"q     c #C7B6D8",
-"r     c #D3C5E0",
-"s     c #F0EBF5",
-"t     c #F5F0F9",
-"u     c #EBE0F3",
-"v     c #E0D2EB",
-"w     c #D4C5E2",
-"x     c #AE98C4",
-"y     c #C7C2CC",
-"z     c #C8BDD3",
-"A     c #E3DAEC",
-"B     c #D8CCE4",
-"C     c #C6B6D7",
-"D     c #D2C4DF",
-"E     c #CFC0DE",
-"F     c #CFC1DE",
-"G     c #CBBCDB",
-"H     c #DACCE7",
-"I     c #D0C1E0",
-"J     c #C9B9DA",
-"K     c #C5B3D6",
-"L     c #BDAACF",
-"M     c #ADA2B8",
-"N     c #C9BED5",
-"O     c #D2C5E0",
-"P     c #CBBBDA",
-"Q     c #BCABCC",
-"R     c #CCC7D1",
-"S     c #C9B8D8",
-"T     c #CABADA",
-"U     c #C7B7D8",
-"V     c #BEABD1",
-"W     c #A697B3",
-"X     c #C8BCD4",
-"Y     c #E3DBEC",
-"Z     c #CCBDD9",
-"`     c #BDB0CA",
-" .    c #CEC0DD",
-"..    c #A495B1",
-"+.    c #C7BDD2",
-"@.    c #E2DAEB",
-"#.    c #E5DCED",
-"$.    c #E5DDED",
-"%.    c #E8E1EF",
-"&.    c #D1C4DF",
-"*.    c #CCBDDB",
-"=.    c #CCBCDB",
-"-.    c #B9A6CD",
-";.    c #ABA0B5",
-">.    c #D6D2DB",
-",.    c #D6CBE2",
-"'.    c #EAE4F1",
-").    c #F2EEF6",
-"!.    c #F4F1F8",
-"~.    c #DBD0E6",
-"{.    c #C8B8D8",
-"].    c #CABBDA",
-"^.    c #CEBFDD",
-"/.    c #CDBDDC",
-"(.    c #A28BB9",
-"_.    c #C9C6CC",
-":.    c #C5B8D2",
-"<.    c #F6F4F9",
-"[.    c #E8E1F0",
-"}.    c #D2C4E0",
-"|.    c #A190B1",
-"1.    c #D8D4DC",
-"2.    c #D9D0E3",
-"3.    c #F9F7FB",
-"4.    c #F5F2F9",
-"5.    c #C4B3D6",
-"6.    c #A590B9",
-"7.    c #CAC8CD",
-"8.    c #D6D1DB",
-"9.    c #DED6E7",
-"0.    c #F8F6FA",
-"a.    c #FAF8FC",
-"b.    c #EFEAF4",
-"c.    c #E0D6EA",
-"d.    c #C5B4D6",
-"e.    c #A490B8",
-"f.    c #BFBAC5",
-"g.    c #D7D3DB",
-"h.    c #C9BED4",
-"i.    c #E7E0EF",
-"j.    c #DCD2E7",
-"k.    c #D3C5E1",
-"l.    c #D0C2DE",
-"m.    c #B39EC6",
-"n.    c #A392B4",
-"o.    c #D4D0D8",
-"p.    c #C0B5CB",
-"q.    c #BCAFC9",
-"r.    c #AD9CBE",
-"s.    c #A593B6",
-"t.    c #AFA3BA",
-"u.    c #CCC9CF",
-"v.    c #E1E2E1",
-"w.    c #E6E7E6",
-"          . + @ # $ % &           ",
-"      * = - ; > , ' ) ! ~ {       ",
-"    ] ^ / ( _ > , : < [ } | 1     ",
-"  2 3 4 5 ( _ > 6 7 8 [ [ 9 0 a   ",
-"  b c d 5 ( _ e f g [ [ h i j k   ",
-"l m n d 5 ( o p q r s t u v w x y ",
-"z A n d 5 B C D E F G H I J K L M ",
-"N n n d 5 O P Q R S p J T U K V W ",
-"X Y n d 5 6 T Z `  .q T T U K V ..",
-"+.@.#.Y $.%.&.*.&.T q =.T U K -.;.",
-">.,.%.'.).} !.~.{.].^./.T U K (._.",
-"  :.'.<.[ [ } [., }.E /.T U V |.  ",
-"  1.2.3.[ [ 4.A , }.E /.T 5.6.7.  ",
-"    8.9.0.a.b.c., }.E /.d.e.f.    ",
-"      g.h.@.i.j.k.l.G m.n._.      ",
-"          o.p.q.r.s.t.u.v.w.w.w.w."};
+">     c #D5C7E2",
+",     c #E1D4EC",
+"'     c #ECE3F4",
+")     c #F4F0F8",
+"!     c #CFC3DA",
+"~     c #CEC7D4",
+"{     c #C8BED2",
+"]     c #CDBFDB",
+"^     c #DED4E8",
+"/     c #DCD1E7",
+"(     c #DACEE5",
+"_     c #E4D7EE",
+":     c #F4EEF8",
+"<     c #FAF9FC",
+"[     c #F9F8FB",
+"}     c #E2DAE9",
+"|     c #C7C0CF",
+"1     c #E5E2E9",
+"2     c #D2C5DE",
+"3     c #E1D8EB",
+"4     c #DFD5E9",
+"5     c #D5C8E2",
+"6     c #E8DDF1",
+"7     c #F8F6FB",
+"8     c #F9F8FC",
+"9     c #D9CEE3",
+"0     c #C8C2CF",
+"a     c #C8BBD6",
+"b     c #E3D9EB",
+"c     c #E2D9EB",
+"d     c #D6C9E3",
+"e     c #EFE6F5",
+"f     c #F9F6FB",
+"g     c #F0E9F6",
+"h     c #E5D8EF",
+"i     c #AE9CBF",
+"j     c #D9D4DE",
+"k     c #D7CCE3",
+"l     c #E4DCED",
+"m     c #D4C6E1",
+"n     c #C7B6D8",
+"o     c #D3C5E0",
+"p     c #F0EBF5",
+"q     c #F5F0F9",
+"r     c #EBE0F3",
+"s     c #E0D2EB",
+"t     c #D4C5E2",
+"u     c #AE98C4",
+"v     c #C7C2CC",
+"w     c #C8BDD3",
+"x     c #E3DAEC",
+"y     c #D8CCE4",
+"z     c #C6B6D7",
+"A     c #CFC0DE",
+"B     c #CFC1DE",
+"C     c #CBBCDB",
+"D     c #DACCE7",
+"E     c #D0C1E0",
+"F     c #C9B9DA",
+"G     c #C5B3D6",
+"H     c #BDAACF",
+"I     c #ADA2B8",
+"J     c #C9BED5",
+"K     c #D2C5E0",
+"L     c #CBBBDA",
+"M     c #CCC7D1",
+"N     c #C9B8D8",
+"O     c #C8B7D8",
+"P     c #CABADA",
+"Q     c #C7B7D8",
+"R     c #BEABD1",
+"S     c #A697B3",
+"T     c #C8BCD4",
+"U     c #E3DBEC",
+"V     c #BDB0CA",
+"W     c #CEC0DD",
+"X     c #A495B1",
+"Y     c #C7BDD2",
+"Z     c #E2DAEB",
+"`     c #E5DCED",
+" .    c #E5DDED",
+"..    c #E8E1EF",
+"+.    c #D1C4DF",
+"@.    c #CCBCDB",
+"#.    c #B9A6CD",
+"$.    c #ABA0B5",
+"%.    c #D6D2DB",
+"&.    c #D6CBE2",
+"*.    c #EAE4F1",
+"=.    c #F2EEF6",
+"-.    c #F4F1F8",
+";.    c #C8B8D8",
+">.    c #CABBDA",
+",.    c #CEBFDD",
+"'.    c #CDBDDC",
+").    c #A28BB9",
+"!.    c #C9C6CC",
+"~.    c #C5B8D2",
+"{.    c #F6F4F9",
+"].    c #D2C4E0",
+"^.    c #A190B1",
+"/.    c #D8D4DC",
+"(.    c #D9D0E3",
+"_.    c #F9F7FB",
+":.    c #F5F2F9",
+"<.    c #C4B3D6",
+"[.    c #A590B9",
+"}.    c #CAC8CD",
+"|.    c #D6D1DB",
+"1.    c #DED6E7",
+"2.    c #F8F6FA",
+"3.    c #FAF8FC",
+"4.    c #EFEAF4",
+"5.    c #C5B4D6",
+"6.    c #A490B8",
+"7.    c #BFBAC5",
+"8.    c #D7D3DB",
+"9.    c #C9BED4",
+"0.    c #E7E0EF",
+"a.    c #D3C5E1",
+"b.    c #D0C2DE",
+"c.    c #B39EC6",
+"d.    c #A392B4",
+"e.    c #D4D0D8",
+"f.    c #C0B5CB",
+"g.    c #AD9CBE",
+"h.    c #A593B6",
+"i.    c #AFA3BA",
+"j.    c #CCC9CF",
+"k.    c #E1E2E1",
+"l.    c #FDFDFD",
+"m.    c #FBFBFB",
+". . . . . + @ # $ % & . . . . . ",
+". . . * = - ; > , ' ) ! ~ . . . ",
+". . { ] ^ / ( > _ : < [ } | . . ",
+". 1 2 3 4 / ( 5 6 7 < < 8 9 0 . ",
+". a b c 4 / ( d e < < f g h i . ",
+"j k l c 4 / m n o p q r s t u v ",
+"w x l c 4 y z A B C D E F G H I ",
+"J l l c 4 K L M N O F P Q G R S ",
+"T U l c 4 5 P V W n P P Q G R X ",
+"Y Z ` U  ...+.+.P n @.P Q G #.$.",
+"%.&...*.=.[ -.;.>.,.'.P Q G ).!.",
+". ~.*.{.< < [ > ].A '.P Q R ^.. ",
+". /.(._.< < :.> ].A '.P <.[.}.. ",
+". . |.1.2.3.4.> ].A '.5.6.7.. . ",
+". . . 8.9.Z 0.a.b.C c.d.!.. . . ",
+". . . . . e.f.g.h.i.j.k.l.l.l.m."};
index a34a33c9f9e16f2a8f8b3e15a517a339cc41c424..e57ff2f20ddc4f0f042630ade0716d78e9c87907 100644 (file)
@@ -1,41 +1,23 @@
 /* XPM */
-static char *type_unknown_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    32    32        2            1",
-/* colors */
-". c #000000",
-"# c #ffffff",
-/* pixels */
-"################################",
-"################################",
-"####................############",
-"####................############",
-"####..############....##########",
-"####..############....##########",
-"####..##..##..####..##..########",
-"####..##..##..####..##..########",
-"####..############........######",
-"####..############........######",
-"####..##..##..##########..######",
-"####..##..##..##########..######",
-"####..##################..######",
-"###...##################..######",
-"####..##..##..##..##..##..######",
-"####..##..##..##..##..##..######",
-"####..##################..######",
-"####..##################..######",
-"####..##..##..##..##..##..######",
-"####..##..##..##..##..##..######",
-"####..##################..######",
-"####..##################..######",
-"####..##..##..##..##..##..######",
-"####..##..##..##..##..##..######",
-"####..##################..######",
-"####..##################..######",
-"####......................######",
-"####......................######",
-"################################",
-"################################",
-"################################",
-"################################"
-};
+static char * type_unknown_xpm[] = {
+"16 16 4 1",
+"      c None",
+".     c #FFFFFF",
+"+     c #000000",
+"@     c #BFBFBF",
+"................",
+"..++++++++......",
+"..+......++.....",
+"..+.+.+..+.+....",
+"..+......++++...",
+"..+.+.+.....+...",
+".@+.........+...",
+"..+.+.+.+.+.+...",
+"..+.........+...",
+"..+.+.+.+.+.+...",
+"..+.........+...",
+"..+.+.+.+.+.+...",
+"..+.........+...",
+"..+++++++++++...",
+"................",
+"................"};
index 7a5ffe0f740bf95347730c18448c9f45d65bae69..e1c4ff3061f1473b5ba82a8843411679e8f41a42 100644 (file)
@@ -331,7 +331,8 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
 
     for( int i = 0; i< WXSIZEOF( icons ) ; i++ )
     {
-       p_images->Add( wxBitmap( wxBitmap(icons[i]).ConvertToImage().Rescale(16,16) ) );
+//       p_images->Add( wxBitmap( wxBitmap(icons[i]).ConvertToImage().Rescale(16,16) ) );
+         p_images->Add( wxIcon( icons[i] ));
     }
 
     treectrl->AssignImageList( p_images );