Make icon a png instead of xpm (fixes #226)

This commit is contained in:
Micah Lee 2016-03-04 15:15:44 +01:00
parent d42d84b3b6
commit b702ed1784
6 changed files with 3 additions and 2962 deletions

View File

@ -5,5 +5,5 @@ Comment=Tor Browser Launcher Settings
Exec=torbrowser-launcher --settings
Terminal=false
Type=Application
Icon=torbrowser80.xpm
Icon=torbrowser
Categories=Network;WebBrowser;

View File

@ -5,5 +5,5 @@ Comment=Launch Tor Browser
Exec=torbrowser-launcher %u
Terminal=false
Type=Application
Icon=torbrowser80.xpm
Icon=torbrowser
Categories=Network;WebBrowser;

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -1,665 +0,0 @@
/* XPM */
static char * torbrowser32_xpm[] = {
"32 32 630 2",
" c None",
". c #C4A7D3",
"+ c #C3AAD2",
"@ c #C0ABCE",
"# c #C0ACCE",
"$ c #C5A8D4",
"% c #C9A5D9",
"& c #C3A9D2",
"* c #B1BABD",
"= c #A2C8AC",
"- c #94D59B",
"; c #80E086",
"> c #7AE07E",
", c #79E07E",
"' c #80DF85",
") c #93D69A",
"! c #A2CAAB",
"~ c #B0BCBC",
"{ c #C2AAD1",
"] c #C9A4D9",
"^ c #C6A8D6",
"/ c #C8A4D8",
"( c #A2C6AB",
"_ c #79EE7C",
": c #60D364",
"< c #5CBC62",
"[ c #63916D",
"} c #61A769",
"| c #60BC65",
"1 c #61BB67",
"2 c #649A6F",
"3 c #618B6D",
"4 c #5DA167",
"5 c #63C768",
"6 c #77E47B",
"7 c #A0CBA9",
"8 c #C8A6D9",
"9 c #C7A6D7",
"0 c #BCB0C9",
"a c #72ED76",
"b c #5BEB5C",
"c c #698174",
"d c #8D7A9E",
"e c #937AA4",
"f c #78A883",
"g c #59B65F",
"h c #6A9D74",
"i c #6D8E78",
"j c #639C6D",
"k c #787089",
"l c #805E95",
"m c #7D6192",
"n c #6C6A7D",
"o c #5DC362",
"p c #70EC73",
"q c #BAB3C7",
"r c #C7A6D6",
"s c #A8BEB4",
"t c #5CCF60",
"u c #61CA66",
"v c #818A8E",
"w c #A17DB3",
"x c #9D80AF",
"y c #9A7DAD",
"z c #76A780",
"A c #6DCA74",
"B c #7EA18B",
"C c #819290",
"D c #74A780",
"E c #807C92",
"F c #88629E",
"G c #835D9A",
"H c #855C9C",
"I c #7B5890",
"J c #657F72",
"K c #59CE5E",
"L c #A5C1AF",
"M c #C4A8D4",
"N c #9FC9A8",
"O c #65D369",
"P c #9874AA",
"Q c #70C977",
"R c #959FA3",
"S c #A883B9",
"T c #A486B6",
"U c #A285B4",
"V c #9D7CAF",
"W c #7D7B8C",
"X c #71897D",
"Y c #6F887C",
"Z c #7E728F",
"` c #8E67A3",
" . c #8C67A2",
".. c #855A9E",
"+. c #83669A",
"@. c #796C8C",
"#. c #7F5496",
"$. c #60C866",
"%. c #9CCCA5",
"&. c #C6A8D5",
"*. c #ABBCB7",
"=. c #5FFC60",
"-. c #68EF6A",
";. c #A68BB7",
">. c #92959F",
",. c #63C568",
"'. c #8CBD96",
"). c #AB90BB",
"!. c #AE85C0",
"~. c #AB84BD",
"{. c #A685B9",
"]. c #8DA899",
"^. c #A07CB3",
"/. c #9C73B1",
"(. c #966DAC",
"_. c #9366A9",
":. c #915FA8",
"<. c #7D858E",
"[. c #6D887B",
"}. c #7F6295",
"|. c #846999",
"1. c #60F661",
"2. c #60FC60",
"3. c #A8BEB3",
"4. c #C6A6D5",
"5. c #C6A9D5",
"6. c #BFACCD",
"7. c #5FFB5F",
"8. c #61FF61",
"9. c #5EFF5D",
"0. c #89C193",
"a. c #B28DC3",
"b. c #9C8DAB",
"c. c #6A9974",
"d. c #5AD55D",
"e. c #75DE7A",
"f. c #85C68E",
"g. c #6BED6D",
"h. c #63FB63",
"i. c #6CE66F",
"j. c #8AA198",
"k. c #81AB8F",
"l. c #77BD80",
"m. c #5CAA63",
"n. c #6D7B7C",
"o. c #815C99",
"p. c #8958A2",
"q. c #79978A",
"r. c #5FFF5D",
"s. c #5CFD5C",
"t. c #BCAECB",
"u. c #C5A7D4",
"v. c #CAA2D9",
"w. c #78E57D",
"x. c #60FF60",
"y. c #62FE62",
"z. c #5CFF5C",
"A. c #86CE8E",
"B. c #B39EC2",
"C. c #BBA1CA",
"D. c #A67FB7",
"E. c #897D98",
"F. c #70C976",
"G. c #60FF5F",
"H. c #64DE67",
"I. c #768584",
"J. c #7D5A91",
"K. c #9165A8",
"L. c #9164A9",
"M. c #847699",
"N. c #6FC578",
"O. c #64EC67",
"P. c #76E77A",
"Q. c #CAA3D9",
"R. c #C19ED1",
"S. c #A6B8B2",
"T. c #60FC61",
"U. c #5EFF5E",
"V. c #69D56D",
"W. c #A4AEB0",
"X. c #A7BAB1",
"Y. c #BE9FCD",
"Z. c #9DA8A9",
"`. c #62F163",
" + c #77CE7E",
".+ c #A477BA",
"++ c #9C77B2",
"@+ c #976EAD",
"#+ c #9166A9",
"$+ c #6CDA72",
"%+ c #61FC61",
"&+ c #A2BBAD",
"*+ c #BA9AC9",
"=+ c #7FD884",
"-+ c #61FE61",
";+ c #62FF62",
">+ c #63E565",
",+ c #90B09A",
"'+ c #7DDF81",
")+ c #60FA60",
"!+ c #C99BDA",
"~+ c #B598C4",
"{+ c #76D97B",
"]+ c #63FC63",
"^+ c #85A192",
"/+ c #A57ABA",
"(+ c #9F72B5",
"_+ c #9281A6",
":+ c #74C57D",
"<+ c #64F566",
"[+ c #7CDA82",
"}+ c #B99AC8",
"|+ c #A8A0B5",
"1+ c #6FEA72",
"2+ c #60FF5E",
"3+ c #64FF64",
"4+ c #62FF61",
"5+ c #5FF35F",
"6+ c #A6C5B0",
"7+ c #AFAEBE",
"8+ c #7EDA85",
"9+ c #65D768",
"0+ c #A380B7",
"a+ c #9994AB",
"b+ c #89A597",
"c+ c #61F962",
"d+ c #6DEB70",
"e+ c #A7A2B4",
"f+ c #AC8FBB",
"g+ c #96A9A2",
"h+ c #62F863",
"i+ c #61FE62",
"j+ c #5FDA62",
"k+ c #957FA3",
"l+ c #8D869A",
"m+ c #65AA6C",
"n+ c #7A9F83",
"o+ c #619969",
"p+ c #57AB5D",
"q+ c #5DE85F",
"r+ c #63F762",
"s+ c #5FD462",
"t+ c #57CA5A",
"u+ c #59D25A",
"v+ c #5FFF5F",
"w+ c #61FD61",
"x+ c #95AFA0",
"y+ c #A589B4",
"z+ c #9692A4",
"A+ c #68C86F",
"B+ c #5CFF5A",
"C+ c #9B9CA9",
"D+ c #C2A4D2",
"E+ c #C5AAD4",
"F+ c #C3A1D2",
"G+ c #C7A8D6",
"H+ c #C8A7D8",
"I+ c #BB92CD",
"J+ c #80B989",
"K+ c #868D94",
"L+ c #A674BB",
"M+ c #9E78B2",
"N+ c #71DA76",
"O+ c #61FF60",
"P+ c #65E868",
"Q+ c #65E068",
"R+ c #5DF45D",
"S+ c #8EB197",
"T+ c #9E84AD",
"U+ c #9A87AA",
"V+ c #937CA8",
"W+ c #66D769",
"X+ c #58FF56",
"Y+ c #B69BC7",
"Z+ c #BD9ACF",
"`+ c #BDA1CD",
" @ c #BFA3CF",
".@ c #BDA2CE",
"+@ c #BC9ECC",
"@@ c #B89BCA",
"#@ c #AA8ABC",
"$@ c #B28EC6",
"%@ c #AE8AC2",
"&@ c #9B9FAC",
"*@ c #68F369",
"=@ c #60EB61",
"-@ c #6AD36F",
";@ c #66E16A",
">@ c #649F6F",
",@ c #5FF15F",
"'@ c #64F564",
")@ c #70987E",
"!@ c #889B93",
"~@ c #987EA7",
"{@ c #987FA9",
"]@ c #A378BB",
"^@ c #82BB8F",
"/@ c #74E578",
"(@ c #9ABCA7",
"_@ c #BF96D2",
":@ c #BD99CF",
"<@ c #BC99CD",
"[@ c #B99ACB",
"}@ c #B696C9",
"|@ c #B492C7",
"1@ c #B08CC4",
"2@ c #AD87C2",
"3@ c #979FA8",
"4@ c #65F766",
"5@ c #77AD84",
"6@ c #76C880",
"7@ c #67CB6E",
"8@ c #8A60A5",
"9@ c #749084",
"0@ c #64F964",
"a@ c #8F68AA",
"b@ c #8F7DA2",
"c@ c #987FA7",
"d@ c #9379A2",
"e@ c #8F839E",
"f@ c #9B80B2",
"g@ c #7BC984",
"h@ c #60FE60",
"i@ c #67BE6D",
"j@ c #67C26D",
"k@ c #6BD070",
"l@ c #6B9D74",
"m@ c #5FD363",
"n@ c #7CD284",
"o@ c #8ABE95",
"p@ c #A99EBA",
"q@ c #AD99BE",
"r@ c #AB95BE",
"s@ c #A890BC",
"t@ c #A58CBA",
"u@ c #948FA6",
"v@ c #5CA762",
"w@ c #76A184",
"x@ c #66DF6B",
"y@ c #60EF63",
"z@ c #61FD62",
"A@ c #72C47C",
"B@ c #9661B3",
"C@ c #9456B0",
"D@ c #63D467",
"E@ c #9169AD",
"F@ c #8D7F9E",
"G@ c #9379A1",
"H@ c #8C729B",
"I@ c #8B779C",
"J@ c #818B92",
"K@ c #69E86C",
"L@ c #63F964",
"M@ c #939BA4",
"N@ c #A27DB7",
"O@ c #60ED61",
"P@ c #AE95C1",
"Q@ c #A678BA",
"R@ c #8B819B",
"S@ c #748D81",
"T@ c #6BB473",
"U@ c #67CE6E",
"V@ c #69C670",
"W@ c #6BC173",
"X@ c #6BBF72",
"Y@ c #69C171",
"Z@ c #65CE6B",
"`@ c #61C965",
" # c #5BB461",
".# c #6E8C7C",
"+# c #8A44A6",
"@# c #62EA65",
"## c #63D168",
"$# c #7F7493",
"%# c #9462B0",
"&# c #9560B2",
"*# c #78808A",
"=# c #7C858F",
"-# c #887899",
";# c #8C739B",
"># c #866C95",
",# c #838092",
"'# c #8D76A4",
")# c #65F667",
"!# c #9B82B0",
"~# c #AB79C3",
"{# c #7C9E88",
"]# c #88C393",
"^# c #AE83C3",
"/# c #AE88C2",
"(# c #AE88C3",
"_# c #AA80C0",
":# c #A477B9",
"<# c #9E73B3",
"[# c #9A71B0",
"}# c #976EAE",
"|# c #868C98",
"1# c #69D56F",
"2# c #67E96A",
"3# c #63FF63",
"4# c #66F468",
"5# c #79B885",
"6# c #6BA276",
"7# c #7D858F",
"8# c #945AB1",
"9# c #945EB1",
"0# c #78A087",
"a# c #748086",
"b# c #837E98",
"c# c #80828F",
"d# c #80658F",
"e# c #778583",
"f# c #8B7FA0",
"g# c #63D667",
"h# c #60FA61",
"i# c #69B373",
"j# c #988FAB",
"k# c #A479BB",
"l# c #8A809C",
"m# c #A680BB",
"n# c #A580BA",
"o# c #A480BA",
"p# c #A47FB9",
"q# c #A37DB8",
"r# c #A17BB7",
"s# c #9E77B5",
"t# c #997AAF",
"u# c #6CE370",
"v# c #63F564",
"w# c #67E969",
"x# c #8E6AA8",
"y# c #64BB6D",
"z# c #756E89",
"A# c #877F9C",
"B# c #62F064",
"C# c #759080",
"D# c #806590",
"E# c #72767F",
"F# c #808193",
"G# c #7E7591",
"H# c #62F963",
"I# c #7B8D8A",
"J# c #5DB164",
"K# c #70CE78",
"L# c #9195A2",
"M# c #9D7EB2",
"N# c #9C80B2",
"O# c #9F79B5",
"P# c #9D75B4",
"Q# c #9C73B3",
"R# c #9970B1",
"S# c #927AA8",
"T# c #60EF62",
"U# c #60A568",
"V# c #815E98",
"W# c #877E9C",
"X# c #61E163",
"Y# c #747181",
"Z# c #735682",
"`# c #65AE6E",
" $ c #8872A0",
".$ c #64DB68",
"+$ c #5CFF5B",
"@$ c #6FDD74",
"#$ c #7D998C",
"$$ c #82A091",
"%$ c #84A093",
"&$ c #859B95",
"*$ c #859397",
"=$ c #7F9F8D",
"-$ c #5DFF5A",
";$ c #66C86C",
">$ c #78648B",
",$ c #8D53A8",
"'$ c #88759F",
")$ c #64F266",
"!$ c #62C267",
"~$ c #735782",
"{$ c #6F4E7F",
"]$ c #64826F",
"^$ c #63B56B",
"/$ c #65F467",
"($ c #6FB079",
"_$ c #708E7E",
":$ c #678C74",
"<$ c #678674",
"[$ c #678375",
"}$ c #678474",
"|$ c #678F72",
"1$ c #698D75",
"2$ c #5FDE62",
"3$ c #826598",
"4$ c #8D60A6",
"5$ c #8D5AA7",
"6$ c #73B77F",
"7$ c #5FFA5F",
"8$ c #64806F",
"9$ c #6F4D7F",
"0$ c #674477",
"a$ c #5DBD62",
"b$ c #76B083",
"c$ c #8A5CA2",
"d$ c #875EA0",
"e$ c #865D9E",
"f$ c #865C9E",
"g$ c #8858A0",
"h$ c #769D85",
"i$ c #87699D",
"j$ c #895FA1",
"k$ c #8B55A5",
"l$ c #6FBD79",
"m$ c #5AD05E",
"n$ c #674377",
"o$ c #624671",
"p$ c #5E506C",
"q$ c #5CFB5C",
"r$ c #73AD7F",
"s$ c #885CA1",
"t$ c #885F9F",
"u$ c #8A5BA1",
"v$ c #7A8E8B",
"w$ c #62F762",
"x$ c #846F99",
"y$ c #836C99",
"z$ c #6AAD74",
"A$ c #64B36B",
"B$ c #5CF75D",
"C$ c #5E536D",
"D$ c #5C3E6C",
"E$ c #596E64",
"F$ c #5CF85D",
"G$ c #5DFF5C",
"H$ c #758985",
"I$ c #87609E",
"J$ c #8859A0",
"K$ c #8857A1",
"L$ c #8857A2",
"M$ c #7D7790",
"N$ c #5FFF5E",
"O$ c #62EE63",
"P$ c #68A772",
"Q$ c #64AE6D",
"R$ c #746786",
"S$ c #709E7D",
"T$ c #5A7264",
"U$ c #5C3D6C",
"V$ c #573C66",
"W$ c #588461",
"X$ c #5DF95D",
"Y$ c #62C767",
"Z$ c #62906D",
"`$ c #62A26C",
" % c #62B16B",
".% c #66BD6F",
"+% c #69CA72",
"@% c #6BC673",
"#% c #6AC972",
"$% c #67BD6F",
"%% c #60AB69",
"&% c #5EFA5E",
"*% c #66C36D",
"=% c #76698A",
"-% c #84509C",
";% c #70A97C",
">% c #598563",
",% c #573D66",
"'% c #587662",
")% c #5CFE5C",
"!% c #73A07F",
"~% c #815599",
"{% c #806396",
"]% c #7C6491",
"^% c #715D84",
"/% c #6A577C",
"(% c #685B7A",
"_% c #715C84",
":% c #7D6193",
"<% c #69A173",
"[% c #5FF75E",
"}% c #767488",
"|% c #816397",
"1% c #65D26B",
"2% c #587D62",
"3% c #573C65",
"4% c #563866",
"5% c #575165",
"6% c #59D55C",
"7% c #65D76A",
"8% c #7D6F91",
"9% c #815E97",
"0% c #825B98",
"a% c #825C99",
"b% c #835C99",
"c% c #7D5794",
"d% c #725285",
"e% c #729381",
"f% c #575663",
"g% c #563666",
"h% c #563A66",
"i% c #578360",
"j% c #5DB463",
"k% c #6C9978",
"l% c #749282",
"m% c #788289",
"n% c #7A768D",
"o% c #7C6D90",
"p% c #7A758D",
"q% c #6D9879",
"r% c #5EB565",
"s% c #568A5F",
"t% c #563766",
"u% c #583B67",
"v% c #563366",
"w% c #574465",
"x% c #566962",
"y% c #587D61",
"z% c #5C8B65",
"A% c #5FA167",
"B% c #61A06A",
"C% c #5C8C65",
"D% c #577D61",
"E% c #566A61",
"F% c #574564",
"G% c #573466",
"H% c #574266",
"I% c #574565",
"J% c #574666",
"K% c #564565",
"L% c #574165",
"M% c #563C66",
" . + @ # # @ + $ ",
" % & * = - ; > , ' ) ! ~ { ] ",
" ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 ^ ",
" 9 0 a b c d e f g h i j k l m n o p q r ",
" $ s t u v w x y z A B C D E F G H I J K L $ ",
" M N O P Q R S T U V W X Y Z ` .F ..+.@.#.$.%.$ ",
" &.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4. ",
" 5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.8.s.t.u. ",
" v.w.x.y.y.z.A.B.C.D.E.F.G.y.8.H.I.J.K.L.M.N.O.8.y.x.P.Q. ",
" R.S.T.y.8.8.y.U.V.W.X.Y.Z.`.8.8. +.+++@+#+$+G.8.y.8.y.%+&+R. ",
" *+=+-+8.;+;+;+>+,+'+)+!+~+{+8.]+^+/+(+_+:+<+8.;+;+;+8.8.[+}+ ",
" |+1+8.;+;+-+;+2+3+4+5+6+7+8+8.9+0+a+b+c+y.8.y.;+;+;+;+8.d+e+ ",
"f+g+h+8.4+i+4+j+k+l+m+n+o+p+q+r+s+t+u+v+y.8.-+;+y.8.8.;+8.w+x+f+",
"y+z+A+-+y.;+B+C+D+E+F+G+H+I+J+K+L+M+N+8.8.O+y.;+8.P+Q+8.w+R+S+y+",
"T+U+V+W+8.;+X+Y+Z+`+ @.@+@@@#@$@%@&@*@8.=@-@8.;+8.;@>@,@'@)@!@T+",
"~@{@]@^@x.8.G./@(@_@:@<@[@}@|@1@2@3@4@O+5@6@x.;+8.7@8@9@0@a@b@c@",
"d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@s@t@u@O v@w@x@y@z@8.A@B@C@D@E@F@G@",
"H@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#",
">#,#'#<+)#!#~#{#]#^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#>#",
"d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#t#u#x.8.8.8.y.v#w#x#y#z#A#B#C#D#",
" E#F#G#H#I#J#K#L#M#N#O#s#P#Q#R#S#B+y.;+;+-+;+8.T#U#V#W#w+X#Y# ",
" Z#`# $.$2+h.x.+$9.@$#$$$%$&$*$=$-$O+4+i+;+O+;$>$,$'$)$8.!$~$ ",
" {$]$^$/$8.8.8.y.8.9.($_$:$<$[$}$|$1$2$;+8.2+3$4$5$6$y.7$8$9$ ",
" 0$a$x.y.;+;+;+;+G.b$c$d$e$e$e$f$g$h$O+8.x.i$j$k$l$8.m$n$ ",
" o$p$q$;+-+y.8.y.G.r$s$t$t$t$t$t$u$v$x.8.w$x$y$z$A$B$C$o$ ",
" D$E$F$8.-+;+8.G$H$I$J$K$K$K$K$L$M$N$4+O$P$Q$R$S$T$U$ ",
" V$W$X$;+w+Y$Z$`$ %.%+%@%@%#%$%%%&%O+*%=%-%;%>%,% ",
" V$'%)%%+!%~%{%]%^%/%(%(%/%_%:%<%[%}%|%1%2%3% ",
" 4%5%6%7%8%9%0%0%a%b%b%a%0%0%c%d%e%6%f%g% ",
" h%g%i%j%k%l%m%n%o%o%p%m%l%q%r%s%t%u% ",
" v%w%x%y%z%A%B%B%A%C%D%E%F%G% ",
" ,%H%I%J%J%K%L%M% "};

File diff suppressed because it is too large Load Diff

View File

@ -130,7 +130,7 @@ class Common:
},
'old_data_dir': old_tbb_data,
'tbl_bin': sys.argv[0],
'icon_file': os.path.join(os.path.dirname(SHARE), 'pixmaps/torbrowser80.xpm'),
'icon_file': os.path.join(os.path.dirname(SHARE), 'pixmaps/torbrowser.png'),
'torproject_pem': os.path.join(SHARE, 'torproject.pem'),
'signing_keys': [os.path.join(SHARE, 'tor-browser-developers.asc')],
'mirrors_txt': [os.path.join(SHARE, 'mirrors.txt'),
@ -235,4 +235,3 @@ class Common:
def save_settings(self):
json.dump(self.settings, open(self.paths['settings_file'], 'w'))
return True