diff options
| author | 2010-03-21 21:12:51 +0000 | |
|---|---|---|
| committer | 2010-03-21 21:12:51 +0000 | |
| commit | d88ffe5744427a2faa01c61d359000aedb0b1b2b (patch) | |
| tree | 3ecfa5bc753ca6256c0f79381aa982789c753538 /src/modules/url | |
| parent | fix for http.get (fixes avatar with spaces) (diff) | |
| download | KVIrc-d88ffe5744427a2faa01c61d359000aedb0b1b2b.tar.gz KVIrc-d88ffe5744427a2faa01c61d359000aedb0b1b2b.tar.bz2 KVIrc-d88ffe5744427a2faa01c61d359000aedb0b1b2b.zip | |
removed old hardcoded pixmap for url module
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4189 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/url')
| -rw-r--r-- | src/modules/url/icons.h | 578 | ||||
| -rw-r--r-- | src/modules/url/libkviurl.cpp | 31 | ||||
| -rw-r--r-- | src/modules/url/libkviurl.h | 6 |
3 files changed, 5 insertions, 610 deletions
diff --git a/src/modules/url/icons.h b/src/modules/url/icons.h deleted file mode 100644 index 4ac4a054d..000000000 --- a/src/modules/url/icons.h +++ /dev/null @@ -1,578 +0,0 @@ -//============================================================================= -// -// File : icons.h -// Creation date : 1999 Andrea Parella -// -// This file is part of the KVIrc irc client distribution -// Copyright (C) 1999-2008 Andrea Parrella (yap@kvirc.net) -// -// This program is FREE software. You can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your opinion) any later version. -// -// This program is distributed in the HOPE that it will be USEFUL, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -// See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, write to the Free Software Foundation, -// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -//============================================================================= - -const char * url_icon_xpm[] = { -"16 16 104 2", -" c None", -". c #FFFFFF", -"+ c #F7F7F7", -"@ c #EFEFEF", -"# c #E7E7E7", -"$ c #DFDFDF", -"% c #D7D7D7", -"& c #CFCFCF", -"* c #C7C7C7", -"= c #BFBFBF", -"- c #B7B7B7", -"; c #AFAFAF", -"> c #A7A7A7", -", c #9F9F9F", -"' c #979797", -") c #8F8F8F", -"! c #878787", -"~ c #000000", -"{ c #090909", -"] c #121212", -"^ c #1B1B1B", -"/ c #242424", -"( c #2D2D2D", -"_ c #363636", -": c #3F3F3F", -"< c #484848", -"[ c #515151", -"} c #5B5B5B", -"| c #646464", -"1 c #6D6D6D", -"2 c #767676", -"3 c #7F7F7F", -"4 c #C0C0C0", -"5 c #AEAEAE", -"6 c #A5A5A5", -"7 c #9B9B9B", -"8 c #929292", -"9 c #898989", -"0 c #777777", -"a c #A7BED2", -"b c #97C5EC", -"c c #95C8F4", -"d c #96BDE0", -"e c #929DA7", -"f c #8B96A0", -"g c #90B7D9", -"h c #90BDE4", -"i c #798FA3", -"j c #888888", -"k c #6F6F6F", -"l c #8AACCA", -"m c #738493", -"n c #5A5A5A", -"o c #919191", -"p c #676767", -"q c #A3A8AD", -"r c #94BBDE", -"s c #8CB3D5", -"t c #66727B", -"u c #9A9A9A", -"v c #5F5F5F", -"w c #99AAB8", -"x c #91B3D0", -"y c #A3A3A3", -"z c #575757", -"A c #94B6D3", -"B c #8697A6", -"C c #7EA0BD", -"D c #3E3E3E", -"E c #ADADAD", -"F c #4F4F4F", -"G c #92B9DC", -"H c #797F83", -"I c #636363", -"J c #748A9E", -"K c #728EA7", -"L c #353535", -"M c #B6B6B6", -"N c #474747", -"O c #85ADCF", -"P c #515C65", -"Q c #2C2C2C", -"R c #91BEE5", -"S c #5F6B74", -"T c #81A9CB", -"U c #222222", -"V c #C8C8C8", -"W c #373737", -"X c #7A8B9A", -"Y c #8FBCE3", -"Z c #87AFD1", -"` c #3F4549", -" . c #191919", -".. c #D1D1D1", -"+. c #2F2F2F", -"@. c #101010", -"#. c #DADADA", -"$. c #272727", -"%. c #060606", -"&. c #E3E3E3", -"*. c #1F1F1F", -"=. c #ECECEC", -"-. c #171717", -";. c #0F0F0F", -". + @ # $ % & * = - ; > , ' ) ! ", -"+ ~ { ] ^ / ( _ : < [ } | 1 2 3 ", -"@ { 4 4 4 - 5 6 7 8 9 3 2 1 3 0 ", -"# ] 4 4 a b c d e f g c h i j k ", -"$ ^ 4 - 5 c c 8 9 3 l c m n o p ", -"% / - 5 q c r 9 3 2 s c t [ u v ", -"& ( 5 6 w c x 3 2 1 c c [ < y z ", -"* _ 6 7 A c B 2 1 m c C < D E F ", -"= : 7 8 G c H 1 I J c K D L M N ", -"- < 8 9 c c 1 I n O c P L Q = : ", -"; [ 9 3 R c I n S c T L Q U V W ", -"> } 3 2 X Y Z C c T ` Q U ...+.", -", | 2 1 I n [ < D L Q U .@.#.$.", -"' 1 1 I n [ < D L Q U .@.%.&.*.", -") 2 3 j o u y E M = V ..#.&.=.-.", -"! 3 0 k p v z F N : W +.$.*.-.;."}; - -const char * url_toolbar_xpm[] = { -"32 32 38 1", -" c None", -". c #000000", -"+ c #FFFBFF", -"@ c #B6C3FF", -"# c #B6C3A6", -"$ c #FFFFFF", -"% c #836977", -"& c #710818", -"* c #20000E", -"= c #710018", -"- c #B60818", -"; c #710000", -"> c #A36B7E", -", c #20050E", -"' c #FFDFCF", -") c #B60018", -"! c #B60800", -"~ c #B60000", -"{ c #B62018", -"] c #B64118", -"^ c #FF2018", -"/ c #B62000", -"( c #B66B7E", -"_ c #040001", -": c #FF4118", -"< c #B66908", -"[ c #58321C", -"} c #FF6918", -"| c #B64100", -"1 c #FFC3A6", -"2 c #20252F", -"3 c #FF4100", -"4 c #EA6B7E", -"5 c #713051", -"6 c #A25E06", -"7 c #B6727E", -"8 c #B64151", -"9 c #4A3211", -"................+@..............", -"................++..............", -"................++..............", -"................+++.............", -"................+++.............", -"................+++.............", -"................#++@...#$#......", -"................@+++..@+++@.....", -"................#+++..+++++.....", -"................@++++#+++++%....", -"................#++++++++++#....", -"......++@.......++++++++++$.....", -".....++++@......++++++.+++......", -".&..@++++++....+++++++..........", -"&&&*++++++++...+++++++..........", -"&&=++++++++++.+++++++++.........", -"-;>++&&.#++++++++++++++.........", -";-+>=&&&,'+++++++++++++#........", -");-;=;&&&*#++++++$$.#+++........", -"!-~-)-=-&&,+++++++...+++........", -".{{!-;);-;&=#+++++@...++#.......", -"..]^!-~-;-=&='+++++...@++.......", -"...{{/{~);-;=;>+++++...++.......", -".....{/^!-~-)-=#++++@...+@......", -"......{/^!-!-;);(++++_...+......", -"........]:/^!-~-;#+++@,..@......", -".........<:/{!-~);(+++&*,.......", -"..........[}|:/^!-~1+++-&&......", -"............}|:/^!-~(++>&;&2....", -".............[3:|:/^!4++;-=5....", -"...............<6|:/{!7+#;-;8...", -"................9}|}|:/1+-~-)..."}; - -const char * urlhigh_toolbar_xpm[] = { -"32 32 33 1", -" c None", -". c #000000", -"+ c #D4FF00", -"@ c #E1FF3A", -"# c #710818", -"$ c #20000E", -"% c #710018", -"& c #B60818", -"* c #710000", -"= c #20050E", -"- c #B60018", -"; c #B60800", -"> c #B60000", -", c #B62018", -"' c #B64118", -") c #FF2018", -"! c #B62000", -"~ c #A36B7E", -"{ c #B66B7E", -"] c #040001", -"^ c #FF4118", -"/ c #B66908", -"( c #58321C", -"_ c #FF6918", -": c #B64100", -"< c #20252F", -"[ c #FF4100", -"} c #EA6B7E", -"| c #713051", -"1 c #A25E06", -"2 c #B6727E", -"3 c #B64151", -"4 c #4A3211", -"................+@..............", -"................++..............", -"................++..............", -"................+++.............", -"................+++.............", -"................+++.............", -"................@++@...@+@......", -"................@+++..@+++@.....", -"................@+++..+++++.....", -"................@++++@+++++@....", -"................@++++++++++@....", -"......++@.......+++++++++++.....", -".....++++@......++++++.+++......", -".#..@++++++....+++++++..........", -"###$++++++++...+++++++..........", -"##%++++++++++.+++++++++.........", -"&*@++##.@++++++++++++++.........", -"*&@@%###=@+++++++++++++@........", -"-*&*%*###$@++++++++.@+++........", -";&>&-&%&##=+++++++...+++........", -".,,;&*-*&*#%@+++++@...++@.......", -"..');&>&*&%#%@+++++...@++.......", -"...,,!,>-*&*%*~+++++...++.......", -".....,!);&>&-&%@++++@...+@......", -"......,!);&;&*-*{++++]...@......", -"........'^!);&>&*@@++@=..@......", -"........./^!,;&>-*{+++#$=.......", -"..........(_:^!);&>@+++&##......", -"............_:^!);&>{++~#*#<....", -".............([^:^!);}++*&%|....", -".............../1:^!,;2+@*&*3...", -"................4_:_:^!@@&>&-..."}; - -const char * urlconf_toolbar_xpm[] = { -"32 32 256 2", -" c None", -". c #000000", -"+ c #FFFBFF", -"@ c #B6C3FF", -"# c #B6C3A6", -"$ c #FFFFFF", -"% c #836977", -"& c #710818", -"* c #F8F5F8", -"= c #212121", -"- c #0F0F0F", -"; c #060606", -"> c #20000E", -", c #EAE7EA", -"' c #D3D2D3", -") c #E3E1E3", -"! c #FCF9FC", -"~ c #BEBCBE", -"{ c #858585", -"] c #545454", -"^ c #323232", -"/ c #010101", -"( c #710018", -"_ c #FEFAFE", -": c #C3C1C3", -"< c #9E9E9E", -"[ c #B7B7B7", -"} c #A5A5A5", -"| c #C0BFC0", -"1 c #EEECEE", -"2 c #848384", -"3 c #757575", -"4 c #828282", -"5 c #4A4A4A", -"6 c #83C6C6", -"7 c #B60818", -"8 c #710000", -"9 c #A36B7E", -"0 c #FCF8FC", -"a c #767576", -"b c #272727", -"c c #3D3D3D", -"d c #707070", -"e c #9B9B9B", -"f c #ABABAB", -"g c #9D9D9D", -"h c #8A8A8A", -"i c #999999", -"j c #9E9D9E", -"k c #CDCBCD", -"l c #FBF7FB", -"m c #F1EEF1", -"n c #EEEBEE", -"o c #A46D80", -"p c #703441", -"q c #242020", -"r c #353535", -"s c #888888", -"t c #A3A3A3", -"u c #949494", -"v c #959595", -"w c #A3A1A3", -"x c #A09FA0", -"y c #868586", -"z c #FAF7FA", -"A c #B60018", -"B c #720303", -"C c #B91221", -"D c #770C0C", -"E c #883446", -"F c #948888", -"G c #6A6A6A", -"H c #6D6D6D", -"I c #9F9F9F", -"J c #AAAAAA", -"K c #A1A1A1", -"L c #A4A4A4", -"M c #A0A0A0", -"N c #939393", -"O c #898989", -"P c #6B6B6B", -"Q c #C9C9C9", -"R c #B60800", -"S c #B1303C", -"T c #8B5151", -"U c #A06D72", -"V c #B28D91", -"W c #B6B3B3", -"X c #9C9C9C", -"Y c #B1B1B1", -"Z c #B3B3B3", -"` c #AFAFAF", -" . c #A6A59E", -".. c #B5A874", -"+. c #B3A46A", -"@. c #949287", -"#. c #919191", -"$. c #939293", -"%. c #171717", -"&. c #A85752", -"*. c #686463", -"=. c #8C8C8C", -"-. c #BBBBBB", -";. c #C2C2C2", -">. c #BEBEBE", -",. c #BDBDBD", -"'. c #ADACAC", -"). c #8F7E3D", -"!. c #D1B440", -"~. c #CDAF39", -"{. c #BDA64A", -"]. c #9F9E98", -"^. c #989898", -"/. c #7F7F7F", -"(. c #B7C2F5", -"_. c #414141", -":. c #525151", -"<. c #616161", -"[. c #7A7A7A", -"}. c #B6B6B6", -"|. c #C3C3C3", -"1. c #85847F", -"2. c #A58F3B", -"3. c #E5C752", -"4. c #D7BA47", -"5. c #CBAE3C", -"6. c #9F9981", -"7. c #A2A2A2", -"8. c #7E7E7E", -"9. c #CFCDCF", -"0. c #0D0D0D", -"a. c #2C2C2C", -"b. c #141414", -"c. c #100C0C", -"d. c #505050", -"e. c #C6C6C6", -"f. c #CACACA", -"g. c #A9A9A7", -"h. c #5A5027", -"i. c #D4BB58", -"j. c #E8CB57", -"k. c #D0B651", -"l. c #99968B", -"m. c #979797", -"n. c #6F6F6F", -"o. c #070707", -"p. c #202020", -"q. c #2F2F2F", -"r. c #383838", -"s. c #585858", -"t. c #7C7C7C", -"u. c #969696", -"v. c #CECECE", -"w. c #C3C2C2", -"x. c #888784", -"y. c #44433C", -"z. c #89805E", -"A. c #8F8D83", -"B. c #8F8F8F", -"C. c #3A3A3A", -"D. c #9DA4C6", -"E. c #343434", -"F. c #575757", -"G. c #909090", -"H. c #D0D0D0", -"I. c #D5D5D5", -"J. c #CBCBCB", -"K. c #BFBFBF", -"L. c #C4C4C4", -"M. c #AEAEAE", -"N. c #BABABA", -"O. c #B0B0B0", -"P. c #666666", -"Q. c #2D2D2D", -"R. c #C0BEC0", -"S. c #040001", -"T. c #020202", -"U. c #373737", -"V. c #363636", -"W. c #565656", -"X. c #D4D4D4", -"Y. c #C1C1C1", -"Z. c #C7C7C7", -"`. c #C5C5C5", -" + c #C0C0C0", -".+ c #B2B2B2", -"++ c #696968", -"@+ c #B8B6B8", -"#+ c #F2EEF2", -"$+ c #FDF9FD", -"%+ c #20050E", -"&+ c #404040", -"*+ c #4D4D4D", -"=+ c #646464", -"-+ c #5F5F5F", -";+ c #5D5D5D", -">+ c #929292", -",+ c #8D8A8A", -"'+ c #AA808A", -")+ c #080808", -"!+ c #424242", -"~+ c #2E2E2E", -"{+ c #1A1A1A", -"]+ c #313131", -"^+ c #3C3C3C", -"/+ c #4B4B4B", -"(+ c #C8C8C8", -"_+ c #A6A6A6", -":+ c #484848", -"<+ c #633636", -"[+ c #FFC7AB", -"}+ c #303030", -"|+ c #3B3B3B", -"1+ c #1D1D1D", -"2+ c #282828", -"3+ c #393939", -"4+ c #7D7D7D", -"5+ c #262423", -"6+ c #1B1A19", -"7+ c #191919", -"8+ c #4B2B2E", -"9+ c #BC1515", -"0+ c #B66B7E", -"a+ c #20252F", -"b+ c #040404", -"c+ c #0E0E0E", -"d+ c #0B0B0B", -"e+ c #252525", -"f+ c #403C3B", -"g+ c #9F5036", -"h+ c #743B2F", -"i+ c #1A1918", -"j+ c #342A28", -"k+ c #974736", -"l+ c #FF261E", -"m+ c #EA6B7E", -"n+ c #713051", -"o+ c #030303", -"p+ c #333333", -"q+ c #090909", -"r+ c #BA751F", -"s+ c #866132", -"t+ c #9E542B", -"u+ c #FE4821", -"v+ c #B62000", -"w+ c #B62018", -"x+ c #B6727E", -"y+ c #B64151", -"z+ c #242424", -"A+ c #2A2A2A", -"B+ c #4A3211", -"C+ c #FF6918", -"D+ c #B64100", -"E+ c #FF4118", -"F+ c #FFC3A6", -"G+ c #B60000", -". . . . . . . . . . . . . . . . + @ . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . + + . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . + + . . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . + + + . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . + + + . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . + + + . . . . . . . . . . . . . ", -". . . . . . . . . . . . . . . . # + + @ . . . # $ # . . . . . . ", -". . . . . . . . . . . . . . . . @ + + + . . @ + + + @ . . . . . ", -". . . . . . . . . . . . . . . . # + + + . . + + + + + . . . . . ", -". . . . . . . . . . . . . . . . @ + + + + # + + + + + % . . . . ", -". . . . . . . . . . . . . . . . # + + + + + + + + + + # . . . . ", -". . . . . . + + @ . . . . . . . + + + + + + + + + + $ . . . . . ", -". . . . . + + + + @ . . . . . . + + + + + + . + + + . . . . . . ", -". & . . @ + + + + + * = - ; . + + + + + + + . . . . . . . . . . ", -"& & & > + , ' ) ! + ~ { ] ^ / + + + + + + + . . . . . . . . . . ", -"& & ( _ : < [ } | 1 2 3 4 5 + 6 + + + + + + + . . . . . . . . . ", -"7 8 9 0 a b c d e f g h i j k l m n + + + + + . . . . . . . . . ", -"8 7 + o p q r c s t u e u v 4 w x y z + + + + # . . . . . . . . ", -"A B C D E F G H I J K L M I N h O P Q / # + + + . . . . . . . . ", -"R S T U V W X i Y Z ` ...+.@.#.v $.%.. . + + + . . . . . . . . ", -". &.*.=.-.;.;.>.,.,.'.).!.~.{.].^./.(.. . . + + # . . . . . . . ", -". _.:.<.] 5 [.}.|.>.1.2.3.4.5.6.7.8.9.b 0.. @ + + . . . . . . . ", -". a.b.c.%.d.g e.f.f.g.h.i.j.k.l.m.X ^.n.= . . + + . . . . . . . ", -". o.p.q.r.s.t.u.f.v.w.x.y.z.A.B.J 8.C.r.D.. . . + @ . . . . . . ", -". . . ; E.c F.G.H.I.J.K.>.L.M.N.O.P.= Q.R.S.. . . + . . . . . . ", -". . . T.U.V.W.L X.K Y.Z.`.Q +Y..+++@+#+$+@ %+. . @ . . . . . . ", -". . / p.&+*+=+-+;+r.F.>+Z.,.I H B.,+'++ + + & > %+. . . . . . . ", -". . )+r ^ !+5 ~+{+]+^+/+(+_+r ~+]+:+<+[++ + + 7 & & . . . . . . ", -". . / a.}+r |+U.%.1+2+3+4+d 5+6+7+}+8+9+0++ + 9 & 8 & a+. . . . ", -". . . b+a.}+c+d+2+}+e+^+^+f+g+h+i+j+k+l+R m++ + 8 7 ( n+. . . . ", -". . . . T.o+. . T.2+q.E.p+r.q+r+s+t+u+v+w+R x++ # 8 7 8 y+. . . ", -". . . . . . . . . z+A+p.1+}+/ . B+C+D+C+D+E+v+F++ 7 G+7 A . . . "}; diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 98efaa2e7..0dd9228c0 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -23,7 +23,6 @@ //============================================================================= #include "libkviurl.h" -#include "icons.h" #include "kvi_module.h" #include "kvi_app.h" @@ -50,7 +49,6 @@ #include <QMouseEvent> #include <QPainter> -static QPixmap * g_pUrlIconPixmap = 0; static KviUrlAction * g_pUrlAction = 0; #ifdef COMPILE_PSEUDO_TRANSPARENCY @@ -144,26 +142,15 @@ KviUrlAction::KviUrlAction(QObject * pParent) "url.list", __tr2qs("Show URL List"), __tr2qs("Shows the URL list window"), - KviActionManager::categoryGeneric()) + KviActionManager::categoryGeneric(), + "kvi_bigicon_www.png", + KVI_SMALLICON_URL + ) { - m_pBigIcon = new QPixmap(url_toolbar_xpm); - m_pSmallIcon = new QPixmap(url_icon_xpm); } KviUrlAction::~KviUrlAction() { - delete m_pBigIcon; - delete m_pSmallIcon; -} - -QPixmap * KviUrlAction::bigIcon() -{ - return m_pBigIcon; -} - -QPixmap * KviUrlAction::smallIcon() -{ - return m_pSmallIcon; } // ---------------------------- CLASS URLDIALOG ------------------------begin // @@ -357,9 +344,7 @@ void UrlDialog::sayToWin(QAction * act) QPixmap *UrlDialog::myIconPtr() { - //QPixmap *icon = new QPixmap(url_icon_xpm); - //return icon; - return g_pUrlIconPixmap; + return g_pIconManager->getSmallIcon(KVI_SMALLICON_URL); } void UrlDialog::addUrl(QString url, QString window, QString count, QString timestamp) @@ -886,8 +871,6 @@ static bool url_module_init(KviModule *m) g_pBanList = new KviPointerList<QString>; g_pBanList->setAutoDelete(true); - g_pUrlIconPixmap = new QPixmap(url_icon_xpm); - KVSM_REGISTER_SIMPLE_COMMAND(m,"list",url_kvs_cmd_list); KVSM_REGISTER_SIMPLE_COMMAND(m,"config",url_kvs_cmd_config); g_pUrlAction = new KviUrlAction(KviActionManager::instance()); @@ -926,10 +909,6 @@ static bool url_module_cleanup(KviModule *) delete g_pUrlAction; g_pUrlAction = 0; - - delete g_pUrlIconPixmap; - g_pUrlIconPixmap = 0; - return true; } diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h index 1718fc55b..3c9e3dc5c 100644 --- a/src/modules/url/libkviurl.h +++ b/src/modules/url/libkviurl.h @@ -139,12 +139,6 @@ class KviUrlAction : public KviKvsAction public: KviUrlAction(QObject * pParent); ~KviUrlAction(); -protected: - QPixmap * m_pBigIcon; - QPixmap * m_pSmallIcon; -public: - virtual QPixmap * bigIcon(); - virtual QPixmap * smallIcon(); }; #endif |
