From 03845215de3fc314c94403b34f4de7515074b516 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 3 Aug 2007 18:52:01 +0000 Subject: [PATCH] better toolbar icons --- wx/README.txt | 12 ++ wx/images/Makefile.am | 4 +- wx/images/minus.xpm | 68 +++++++++ wx/images/play.xpm | 34 +++++ wx/images/plus.xpm | 98 ++++++++++++ wx/images/stop.png | Bin 957 -> 0 bytes wx/images/stop.xpm | 336 +++++++++++++++++++++--------------------- wx/xmission.cc | 15 +- 8 files changed, 395 insertions(+), 172 deletions(-) create mode 100644 wx/README.txt create mode 100644 wx/images/minus.xpm create mode 100644 wx/images/play.xpm create mode 100644 wx/images/plus.xpm delete mode 100644 wx/images/stop.png diff --git a/wx/README.txt b/wx/README.txt new file mode 100644 index 000000000..808d78e27 --- /dev/null +++ b/wx/README.txt @@ -0,0 +1,12 @@ +STATUS: + +The wx client of Transmission is barely even a proof of concept +at this time. The only recommended users at this point are +people willing to contribute artwork or code. + + +CREDITS: + +some Toolbar artwork is by Diana Fong for Fedora's Echo Theme, +under a CC share-alike, and modified here to survive xpm's jaggies. +http://fedoraproject.org/wiki/Artwork/EchoDevelopment diff --git a/wx/images/Makefile.am b/wx/images/Makefile.am index 3147e5ad7..2c60feb1d 100644 --- a/wx/images/Makefile.am +++ b/wx/images/Makefile.am @@ -9,7 +9,9 @@ EXTRA_DIST = \ gtk-properties.xpm \ gtk-remove.png \ gtk-remove.xpm \ - stop.png \ + play.xpm \ + plus.xpm \ + minus.xpm \ stop.xpm \ systray.xpm \ transmission.png \ diff --git a/wx/images/minus.xpm b/wx/images/minus.xpm new file mode 100644 index 000000000..4bee7565e --- /dev/null +++ b/wx/images/minus.xpm @@ -0,0 +1,68 @@ +/* XPM */ +static char * minus_xpm[] = { +"25 9 56 1", +" c None", +". c #1F3038", +"+ c #EBF4F8", +"@ c #E9F3F8", +"# c #EAF3F8", +"$ c #ECF4F8", +"% c #EDF4F8", +"& c #EEF4F8", +"* c #EFF5F8", +"= c #F0F5F8", +"- c #F1F5F8", +"; c #F1F6F8", +"> c #F2F6F8", +", c #F3F6F8", +"' c #F3F5F7", +") c #F1F3F5", +"! c #EEF1F3", +"~ c #DBDBDB", +"{ c #42BCFF", +"] c #19AEFF", +"^ c #22B1FF", +"/ c #33B7FF", +"( c #43BCFF", +"_ c #53C2FF", +": c #5FC6FF", +"< c #6BCAFF", +"[ c #76CEFF", +"} c #7FD2FF", +"| c #87D4FF", +"1 c #8DD7FF", +"2 c #92D8FF", +"3 c #95D9FF", +"4 c #96DAFF", +"5 c #94D9FF", +"6 c #DCE0E2", +"7 c #1AAEFF", +"8 c #28B3FF", +"9 c #35B7FF", +"0 c #41BBFF", +"a c #4BBFFF", +"b c #54C2FF", +"c c #5BC5FF", +"d c #61C7FF", +"e c #65C8FF", +"f c #68C9FF", +"g c #69CAFF", +"h c #67C9FF", +"i c #D3D9DC", +"j c #1CAFFF", +"k c #25B2FF", +"l c #2BB4FF", +"m c #31B6FF", +"n c #38B8FF", +"o c #39B9FF", +"p c #CDD5D9", +"q c #CBD4D9", +".........................", +".+@@@@@#$%&*=-;>,,,,')!~.", +".{]]]]]]^/(_:<[}|1234456.", +".{]]]]]]]]7890abcdefgghi.", +".{]]]]]]]]]]]]jklm9noonp.", +".{]]]]]]]]]]]]]]]]]]]]]q.", +".{]]]]]]]]]]]]]]]]]]]]]q.", +".........................", +"........................."}; diff --git a/wx/images/play.xpm b/wx/images/play.xpm new file mode 100644 index 000000000..67aa645ad --- /dev/null +++ b/wx/images/play.xpm @@ -0,0 +1,34 @@ +/* XPM */ +static char * play_xpm[] = { +"18 24 7 1", +" c None", +". c #ADB7BC", +"+ c #ADB5B8", +"@ c #1F3038", +"# c #193B4B", +"$ c #19AEFF", +"% c #27B3FF", +".+ ", +" ", +" ", +"@@# ", +"@$@@@ ", +"@$$$@@@ ", +"@$$$$$@@@ ", +"@$$$$$$$@@@ ", +"@$$$$$$$$$@@@ ", +"@$$$$$$$$$$$@@@ ", +"@$%$$$$$$$$$$$@@@ ", +"@$%$$$$$$$$$$$$$@@", +"@$%$$$$$$$$$$$$$$@", +"@$%$$$$$$$$$$$$$@@", +"@$%$$$$$$$$$$$@@@ ", +"@$$$$$$$$$$$@@@ ", +"@$$$$$$$$$@@@ ", +"@$$$$$$$@@@ ", +"@$$$$$@@@ ", +"@$$$@@@ ", +"@$@@@ ", +"@@# ", +" ", +" "}; diff --git a/wx/images/plus.xpm b/wx/images/plus.xpm new file mode 100644 index 000000000..d2448708e --- /dev/null +++ b/wx/images/plus.xpm @@ -0,0 +1,98 @@ +/* XPM */ +static char * plus_xpm[] = { +"23 24 71 1", +" c None", +". c #1F3038", +"+ c #EBF8FF", +"@ c #EDF9FF", +"# c #EFF9FF", +"$ c #F1FAFF", +"% c #F7FCFF", +"& c #63C7FF", +"* c #73CDFF", +"= c #84D3FF", +"- c #94D9FF", +"; c #C0E8FF", +"> c #5CC5FF", +", c #6CCBFF", +"' c #7CD0FF", +") c #8CD6FF", +"! c #B8E6FF", +"~ c #51C1FF", +"{ c #61C7FF", +"] c #71CCFF", +"^ c #80D2FF", +"/ c #B1E3FF", +"( c #44BCFF", +"_ c #54C2FF", +": c #63C8FF", +"< c #72CDFF", +"[ c #A6DFFF", +"} c #33B7FF", +"| c #43BCFF", +"1 c #53C2FF", +"2 c #62C7FF", +"3 c #9ADBFF", +"4 c #21B0FF", +"5 c #30B6FF", +"6 c #3FBBFF", +"7 c #4FC0FF", +"8 c #19AEFF", +"9 c #1BAEFF", +"0 c #2AB3FF", +"a c #38B8FF", +"b c #B3E4FF", +"c c #A3DFFF", +"d c #8BD6FF", +"e c #20B0FF", +"f c #4EC1FF", +"g c #A3DEFF", +"h c #A9E0FF", +"i c #AFE3FF", +"j c #BDE7FF", +"k c #C6EBFF", +"l c #42BCFF", +"m c #1FB0FF", +"n c #2BB4FF", +"o c #36B8FF", +"p c #41BBFF", +"q c #4BBFFF", +"r c #55C2FF", +"s c #5DC5FF", +"t c #23B1FF", +"u c #2CB4FF", +"v c #35B7FF", +"w c #3EBAFF", +"x c #1DAFFF", +"y c #A7E0FF", +"z c #7ED2FF", +"A c #1B2F3A", +"B c #2B3E47", +"C c #243641", +"D c #5DC6FF", +"E c #C2E9FF", +"F c #D4F0FF", +" ....... ", +" .+@#$%. ", +" .&*=-;. ", +" .>,')!. ", +" .~{]^/. ", +" .(_:<[. ", +" .}|123. ", +" .4567). ", +".........890a'........ ", +".bccccccd888efghib!jk. ", +".l888888888888mnopqrs. ", +".l888888888888888tuvw. ", +".l888888888888888888x. ", +".l8888888888888888888. ", +".y------z8888lccccccc. ", +"ABBBBBBC.8888D........ ", +" .8888D. ", +" .8888D. ", +" .8888D. ", +" .8888D. ", +" .8888D. ", +" .8888D. ", +" .EEEEF. ", +" ....... "}; diff --git a/wx/images/stop.png b/wx/images/stop.png deleted file mode 100644 index 1a97353c10228d633de3398855e63d607b5f0f5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 957 zcmV;u148_XP)V~5;_X}f zT`_25P){se5|W~$*h?(o>M$O8~iYb*!W`1VI z9Di+(IpIk2P0ThUhqIanUHTGnfJ_bARNC2v zdBP~7(}HWKPVwTKZ{c|!uImCYcwr1TmBMvhJkKKxL%c$PiF2d8qcx7Q(Xu(M#v2ek z?w03F#NrQ^82j{-D&(;wo=&&GhX?w3wOAnSI5@VA6k=^bV>`YSh0KnAUzhm4Pe(@w zzVA1|Uzz=j-b4b&wu#v`N;WrU(|v+URUj-2DMbB|2qDl~69fTTYr-(B?~y{_*fv@z zv{b0|ZXhfRB_xwVvGu^gdZ3=?)n{Yyx1Zn2?<=d-`YTlrzOA5Q47QX!6p~cm-X?gh zERC7eBtL1*a;4G&ZxNKD3Q8)LEQ>de9Kp8jmOvYW7eWwACdqtwfP(J>PAe4bsMNp@^Z@<%R5ZhRc&INTUH&FuN}C(j|o`s@1$Ld_4hFf5pr? fYlhZ>KO5s;ID)WsTyqON00000NkvXXu0mjfr9r;O diff --git a/wx/images/stop.xpm b/wx/images/stop.xpm index 3a2d187f6..9e54f67d6 100644 --- a/wx/images/stop.xpm +++ b/wx/images/stop.xpm @@ -1,167 +1,175 @@ /* XPM */ static char * stop_xpm[] = { -"24 24 140 2", +"23 24 148 2", " c None", -". c #000000", -"+ c #972827", -"@ c #F23F3E", -"# c #EC3C3A", -"$ c #E33635", -"% c #DB312F", -"& c #D32C2A", -"* c #CB2725", -"= c #C42320", -"- c #B11C19", -"; c #220404", -"> c #E43433", -", c #AA0803", -"' c #A60500", -") c #A70601", -"! c #A10C08", -"~ c #1F0302", -"{ c #DD3533", -"] c #910B07", -"^ c #8C0704", -"/ c #9F0501", -"( c #940703", -"_ c #8F0905", -": c #980A06", -"< c #A40D09", -"[ c #DD3433", -"} c #821B19", -"| c #BA8C8B", -"1 c #C29B9A", -"2 c #8A3533", -"3 c #920603", -"4 c #860805", -"5 c #9A5251", -"6 c #CAA9A8", -"7 c #AA6F6E", -"8 c #800B08", -"9 c #AA110E", -"0 c #972727", -"a c #E23331", -"b c #8A0B08", -"c c #F6F6F6", -"d c #F4F4F4", -"e c #EAE3E3", -"f c #930703", -"g c #870805", -"h c #A2615F", -"i c #F5F5F5", -"j c #F2F2F2", -"k c #B01511", -"l c #B11612", -"m c #E13331", -"n c #820805", -"o c #D2B8B7", -"p c #FEFEFE", -"q c #B27E7D", -"r c #B41815", -"s c #CF201C", -"t c #67100E", -"u c #C61E1B", -"v c #822725", -"w c #C51E1B", -"x c #D62421", -"y c #6D1312", -"z c #C11B18", -"A c #AF1916", -"B c #D82522", -"C c #DD2926", -"D c #701514", -"E c #BD1815", -"F c #A70501", -"G c #870906", -"H c #F8F8F8", -"I c #FFFFFF", -"J c #B01A17", -"K c #D92623", -"L c #DF2A27", -"M c #E52E2B", -"N c #741817", -"O c #B81612", -"P c #A80601", -"Q c #AB0803", -"R c #880906", -"S c #FAFAFA", -"T c #B31C19", -"U c #E02B28", -"V c #E62F2C", -"W c #EC3230", -"X c #781A19", -"Y c #B4130F", -"Z c #AC0804", -"` c #890A07", -" . c #BB211F", -".. c #ED3331", -"+. c #F23634", -"@. c #791B1A", -"#. c #B2120E", -"$. c #AD0904", -"%. c #990A07", -"&. c #E2312F", -"*. c #F33735", -"=. c #A60F0C", -"-. c #B10C08", -";. c #870B08", -">. c #F9F9F9", -",. c #D32B29", -"'. c #6A1817", -"). c #210201", -"!. c #AB0F0B", -"~. c #8D0D0A", -"{. c #B41C1A", -"]. c #9C1614", -"^. c #972221", -"/. c #230302", -"(. c #AB1310", -"_. c #801917", -":. c #B51D1B", -"<. c #E22C29", -"[. c #E72F2D", -"}. c #A11917", -"|. c #8B1210", -"1. c #250504", -"2. c #B51A17", -"3. c #A31614", -"4. c #A61816", -"5. c #D12523", -"6. c #E32D2A", -"7. c #E9302E", -"8. c #EF3432", -"9. c #CB2826", -"0. c #B3201E", -"a. c #C32624", -"b. c #8F1F1E", -"c. c #270606", -"d. c #CC2421", -"e. c #EB312F", -"f. c #F03533", -"g. c #2A0807", -"h. c #721715", -"i. c #751917", -" ", -" ", -" . . . . . . . . . ", -" . + @ # $ % & * = - ; ", -" . + > , ' ' ' ' ' ' ) ! ~ ", -" . + { ] ^ / ' ' ' ' ( _ : < ~ ", -" . + [ } | 1 2 3 ' ' 4 5 6 7 8 9 ~ ", -" . 0 a b 6 c d e 2 f g h d i j h k l ~ ", -" . m , n o c p d e 2 h d p c j q r s t . ", -" . u ' 3 5 j c p d e d p c j e v w x y . ", -" . z ' ' 4 h j c p c p c j e 2 A B C D . ", -" . E ' ' F G h j H I H j e 2 J K L M N . ", -" . O ' P Q R h d p S p d e 2 T U V W X . ", -" . Y P Z ` h d p c j c p d e 2 ...+.@.. ", -" . #.$.%.5 d p c j e j c p d e v &.*.@.. ", -" . =.-.;.o >.c j e 2 h j c c j q ,.*.'.. ", -" ).!.~.6 j j e 2 {.].h j j j h ,.^.. ", -" /.(._.| 1 2 :.<.[.}.5 6 7 |.^.. ", -" 1.2.3.4.5.6.7.8.+.9.0.a.b.. ", -" c.d.L M e.f.+.*.*.*.^.. ", -" g.h.i.X @.@.@.@.'.. ", -" . . . . . . . . ", -" ", -" "}; +". c #1F3038", +"+ c #FFFFFF", +"@ c #E7F5FD", +"# c #73C5F2", +"$ c #71C4F2", +"% c #74C5F2", +"& c #7CC9F3", +"* c #84CAF3", +"= c #8CCFF3", +"- c #93D1F4", +"; c #9BD4F4", +"> c #A4D8F5", +", c #AADAF5", +"' c #B3DDF6", +") c #BAE0F6", +"! c #C2E4F6", +"~ c #CAE6F6", +"{ c #D1E9F6", +"] c #D3EAF6", +"^ c #CFE8F6", +"/ c #C9E5F6", +"( c #C2E3F5", +"_ c #FBFDFE", +": c #D2ECFA", +"< c #10A5F6", +"[ c #19AEFF", +"} c #27B2FF", +"| c #34B7FF", +"1 c #42BCFF", +"2 c #50C1FF", +"3 c #5EC6FF", +"4 c #6CCBFF", +"5 c #7ACFFF", +"6 c #87D4FF", +"7 c #95D9FF", +"8 c #A3DEFF", +"9 c #B0E2FF", +"0 c #BDE7FF", +"a c #BCE7FF", +"b c #92D3F8", +"c c #F7FCFE", +"d c #24B1FF", +"e c #32B6FF", +"f c #3FBBFF", +"g c #4EC0FF", +"h c #5CC5FF", +"i c #69CAFF", +"j c #77CFFF", +"k c #85D3FF", +"l c #93D8FF", +"m c #A0DDFF", +"n c #AEE2FF", +"o c #BAE6FF", +"p c #B9E6FF", +"q c #A1DDFF", +"r c #8ED1F8", +"s c #F7FBFE", +"t c #21B0FF", +"u c #2EB5FF", +"v c #3CBAFF", +"w c #4ABFFF", +"x c #57C3FF", +"y c #64C8FF", +"z c #72CDFF", +"A c #7FD1FF", +"B c #8CD6FF", +"C c #99DAFF", +"D c #A4DEFF", +"E c #ABE1FF", +"F c #87CFF7", +"G c #1CAFFF", +"H c #29B3FF", +"I c #37B8FF", +"J c #44BDFF", +"K c #51C1FF", +"L c #6BCAFF", +"M c #83D3FF", +"N c #8DD6FF", +"O c #96D9FF", +"P c #9BDBFF", +"Q c #8ED7FF", +"R c #7DCBF6", +"S c #F6FBFE", +"T c #23B1FF", +"U c #30B6FF", +"V c #3DBAFF", +"W c #56C3FF", +"X c #62C7FF", +"Y c #6DCBFF", +"Z c #81D2FF", +"` c #8BD6FF", +" . c #71C6F6", +".. c #1BAEFF", +"+. c #28B3FF", +"@. c #35B7FF", +"#. c #41BCFF", +"$. c #4CC0FF", +"%. c #6ACAFF", +"&. c #73CDFF", +"*. c #78CFFF", +"=. c #7BD0FF", +"-. c #79CFFF", +";. c #64C1F5", +">. c #F5FBFE", +",. c #1FB0FF", +"'. c #2BB4FF", +"). c #4CBFFF", +"!. c #55C3FF", +"~. c #5DC5FF", +"{. c #68C9FF", +"]. c #56BCF5", +"^. c #F4FAFE", +"/. c #35B8FF", +"(. c #48BEFF", +"_. c #4FC0FF", +":. c #54C2FF", +"<. c #59C4FF", +"[. c #5BC5FF", +"}. c #47B6F4", +"|. c #F3FAFE", +"1. c #20B0FF", +"2. c #39B9FF", +"3. c #40BBFF", +"4. c #46BDFF", +"5. c #49BEFF", +"6. c #4BBFFF", +"7. c #38B2F4", +"8. c #F2FAFE", +"9. c #31B6FF", +"0. c #3BB9FF", +"a. c #28AAF3", +"b. c #F1F9FE", +"c. c #1DAFFF", +"d. c #22B1FF", +"e. c #26B2FF", +"f. c #1AA6F3", +"g. c #F1F9FD", +"h. c #1AAEFF", +"i. c #0DA1F3", +"j. c #F0F9FD", +"k. c #099CEE", +"l. c #0DA2F3", +"m. c #079AEC", +"n. c #F9FCFE", +"o. c #DDF1FC", +"p. c #EEF8FD", +"q. c #FEFFFF", +". . . . . . . . . . . . . . . . . . . . . . . ", +". + + + + + + + + + + + + + + + + + + + + + . ", +". @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ . ", +". : < [ [ } | 1 2 3 4 5 6 7 8 9 0 a 9 8 b c . ", +". : < [ [ d e f g h i j k l m n o p n q r s . ", +". : < [ [ t u v w x y z A B C D E E D C F s . ", +". : < [ [ G H I J K 3 L j M N O P P O Q R S . ", +". : < [ [ [ T U V w W X Y j Z 6 ` ` 6 Z .S . ", +". : < [ [ [ ..+.@.#.$.x X %.&.*.=.=.-.&.;.>.. ", +". : < [ [ [ [ ,.'.I #.).!.~.y {.L L i y ].^.. ", +". : < [ [ [ [ [ t './.f (._.:.<.[.[.<.W }.|.. ", +". : < [ [ [ [ [ [ 1.H e 2.3.4.5.6.6.w 4.7.8.. ", +". : < [ [ [ [ [ [ [ G d '.9./.2.0.0.2.I a.b.. ", +". : < [ [ [ [ [ [ [ [ [ c.d.e.H '.'.H } f.g.. ", +". : < [ [ [ [ [ [ [ [ [ [ [ [ [ ....h.[ i.j.. ", +". : < [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ i.j.. ", +". : < [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ i.j.. ", +". : < [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ i.j.. ", +". : < [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ i.j.. ", +". : < [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ i.j.. ", +". : < [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ i.j.. ", +". : k.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.m.j.. ", +". n.o.o.o.o.o.o.o.o.o.o.@ p.p.p.p.p.p.p.p.q.. ", +". . . . . . . . . . . . . . . . . . . . . . . "}; diff --git a/wx/xmission.cc b/wx/xmission.cc index 4ac54f927..6a16bd232 100755 --- a/wx/xmission.cc +++ b/wx/xmission.cc @@ -42,10 +42,11 @@ extern "C" #include #include - #include - #include - #include + #include #include + #include + #include + #include #include } @@ -534,10 +535,10 @@ MyFrame :: MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size *** Toolbar **/ - wxIcon open_icon( fileopen_xpm ); - wxIcon exec_icon( exec_xpm ); + wxIcon open_icon( plus_xpm ); + wxIcon exec_icon( play_xpm ); wxIcon stop_icon( stop_xpm ); - wxIcon drop_icon( gtk_remove_xpm ); + wxIcon drop_icon( minus_xpm ); wxBitmap bitmap; wxToolBar* toolbar = CreateToolBar( wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT | wxTB_TEXT ); @@ -581,7 +582,7 @@ MyFrame :: MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size myTorrentList->AddListener( this ); wxBoxSizer * panelSizer = new wxBoxSizer( wxVERTICAL ); - panelSizer->Add( buttonSizer, 0, wxTOP, 3 ); + panelSizer->Add( buttonSizer, 0, 0, 0 ); panelSizer->Add( myTorrentList, 1, wxEXPAND, 0 ); panel_1->SetSizer( panelSizer );