diff -urN -x CVS licq/plugins/qt-gui/src/mainwin.cpp licq.patched/plugins/qt-gui/src/mainwin.cpp --- licq/plugins/qt-gui/src/mainwin.cpp Wed Oct 16 08:10:28 2002 +++ licq.patched/plugins/qt-gui/src/mainwin.cpp Thu Oct 17 19:38:19 2002 @@ -79,10 +79,24 @@ #include "usercodec.h" #include "xpm/history.xpm" +#include "xpm/floaty.xpm" +#include "xpm/group.xpm" +#include "xpm/remove.xpm" #include "xpm/info.xpm" #include "xpm/secure_on.xpm" #include "xpm/secure_off.xpm" #include "xpm/charset.xpm" +#include "xpm/sysmsg.xpm" +#include "xpm/security.xpm" +#include "xpm/exit.xpm" +#include "xpm/help.xpm" +#include "xpm/options.xpm" +#include "xpm/contactlist.xpm" +#include "xpm/adduser.xpm" +#include "xpm/menuinfo.xpm" +#include "xpm/menumore.xpm" +#include "xpm/menuwork.xpm" +#include "xpm/menuabout.xpm" #include "licq_qt-gui.conf.h" @@ -454,7 +468,21 @@ pmSecureOn = QPixmap(secure_on_xpm); pmSecureOff = QPixmap(secure_off_xpm); pmHistory = QPixmap(history_xpm); + pmFloaty = QPixmap(floaty_xpm); + pmGroup = QPixmap(group_xpm); + pmRemove = QPixmap(remove_xpm); pmInfo = QPixmap(info_xpm); + pmSysMsg = QPixmap(sysmsg_xpm); + pmSecurity = QPixmap(security_xpm); + pmExit = QPixmap(exit_xpm); + pmHelp = QPixmap(help_xpm); + pmOptions = QPixmap(options_xpm); + pmContactList = QPixmap(contactlist_xpm); + pmAddUser = QPixmap(adduser_xpm); + pmMenuInfo = QPixmap(menuinfo_xpm); + pmMenuMore = QPixmap(menumore_xpm); + pmMenuWork = QPixmap(menuwork_xpm); + pmMenuAbout = QPixmap(menuabout_xpm); #ifdef USE_KDE pmEncoding = KGlobal::iconLoader()->loadIcon("charset", KIcon::Small, 0, KIcon::DefaultState, 0L, true); if (pmEncoding.isNull()) @@ -3024,30 +3052,30 @@ connect(mnuDebug, SIGNAL(activated(int)), this, SLOT(changeDebug(int))); mnuOwnerAdm = new QPopupMenu(NULL); - mnuOwnerAdm->insertItem(tr("&View System Messages"), OwnerMenuView); + mnuOwnerAdm->insertItem(pmSysMsg, tr("&View System Messages"), OwnerMenuView); mnuOwnerAdm->insertSeparator(); - mnuOwnerAdm->insertItem(pmInfo, tr("&General Info"), OwnerMenuGeneral); - mnuOwnerAdm->insertItem(tr("&More Info"), OwnerMenuMore); - mnuOwnerAdm->insertItem(tr("&Work Info"), OwnerMenuWork); - mnuOwnerAdm->insertItem(tr("&About"), OwnerMenuAbout); + mnuOwnerAdm->insertItem(pmMenuInfo, tr("&General Info"), OwnerMenuGeneral); + mnuOwnerAdm->insertItem(pmMenuMore, tr("&More Info"), OwnerMenuMore); + mnuOwnerAdm->insertItem(pmMenuWork, tr("&Work Info"), OwnerMenuWork); + mnuOwnerAdm->insertItem(pmMenuAbout, tr("&About"), OwnerMenuAbout); mnuOwnerAdm->insertItem(pmHistory, tr("&History"), OwnerMenuHistory); mnuOwnerAdm->insertItem(tr("&Last"), OwnerMenuLast); mnuOwnerAdm->insertSeparator(); - mnuOwnerAdm->insertItem(tr("&Security/Password Options"), OwnerMenuSecurity); + mnuOwnerAdm->insertItem(pmSecurity, tr("&Security/Password Options"), OwnerMenuSecurity); mnuOwnerAdm->insertItem(tr("&Random Chat Group"), OwnerMenuRandomChat); mnuOwnerAdm->insertSeparator(); mnuOwnerAdm->insertItem(tr("Debug Level"), mnuDebug); connect (mnuOwnerAdm, SIGNAL(activated(int)), this, SLOT(callOwnerFunction(int))); mnuUserAdm = new QPopupMenu(NULL); - mnuUserAdm->insertItem(tr("&Add User"), this, SLOT(showAddUserDlg())); + mnuUserAdm->insertItem(pmAddUser, tr("&Add User"), this, SLOT(showAddUserDlg())); mnuUserAdm->insertItem(tr("S&earch for User"), this, SLOT(showSearchUserDlg())); mnuUserAdm->insertItem(tr("A&uthorize User"), this, SLOT(showAuthUserDlg())); mnuUserAdm->insertItem(tr("Re&quest Authorization"), this, SLOT(showReqAuthDlg())); mnuUserAdm->insertItem(tr("R&andom Chat"), this, SLOT(slot_randomchatsearch())); mnuUserAdm->insertSeparator(); mnuUserAdm->insertItem(tr("&Popup All Messages"), this, SLOT(slot_popupall())); - mnuUserAdm->insertItem(tr("Edit &Groups"), this, SLOT(showEditGrpDlg())); + mnuUserAdm->insertItem(pmGroup, tr("Edit &Groups"), this, SLOT(showEditGrpDlg())); mnuUserAdm->insertSeparator(); mnuUserAdm->insertItem(tr("Update All Users"), this, SLOT(slot_updateAllUsers())); mnuUserAdm->insertItem(tr("Update Current Group"), this, SLOT(slot_updateAllUsersInGroup())); @@ -3064,24 +3092,24 @@ mnuSystem = new QPopupMenu(NULL); mnuSystem->setCheckable(true); mnuSystem->insertItem(tr("System Functions"), mnuOwnerAdm); - mnuSystem->insertItem(tr("User Functions"), mnuUserAdm); + mnuSystem->insertItem(pmContactList, tr("User Functions"), mnuUserAdm); mnuSystem->insertItem(tr("&Status"), mnuStatus); - mnuSystem->insertItem(tr("&Group"), mnuUserGroups); + mnuSystem->insertItem(pmGroup, tr("&Group"), mnuUserGroups); mnuSystem->insertItem(tr("Set &Auto Response..."), this, SLOT(slot_AwayMsgDlg())); mnuSystem->insertSeparator(); mnuSystem->insertItem(tr("&Network Window"), licqLogWindow, SLOT(show())); mnuSystem->insertItem(tr("&Mini Mode"), this, SLOT(ToggleMiniMode())); mnuSystem->insertItem(tr("Show Offline &Users"), this, SLOT(ToggleShowOffline())); mnuSystem->insertItem(tr("&Thread Group View"), this, SLOT(ToggleThreadView())); - mnuSystem->insertItem(tr("&Options..."), this, SLOT(popupOptionsDlg())); + mnuSystem->insertItem(pmOptions, tr("&Options..."), this, SLOT(popupOptionsDlg())); mnuSystem->insertItem(tr("S&kin Browser..."), this, SLOT(showSkinBrowser())); mnuSystem->insertItem(tr("&Plugin Manager..."), this, SLOT(showPluginDlg())); mnuSystem->insertSeparator(); mnuSystem->insertItem(tr("Next &Server"), this, SLOT(nextServer())); mnuSystem->insertSeparator(); mnuSystem->insertItem(tr("Sa&ve Settings"), this, SLOT(saveOptions())); - mnuSystem->insertItem(tr("&Help"), mnuHelp); - mnuSystem->insertItem(tr("E&xit"), this, SLOT(slot_shutdown())); + mnuSystem->insertItem(pmHelp, tr("&Help"), mnuHelp); + mnuSystem->insertItem(pmExit, tr("E&xit"), this, SLOT(slot_shutdown())); mnuSystem->setItemChecked(mnuSystem->idAt(MNUxITEM_SHOWxOFFLINE), m_bShowOffline); mnuSystem->setItemChecked(mnuSystem->idAt(MNUxITEM_THREADxVIEW), m_bThreadView); @@ -3136,18 +3164,18 @@ mnuUser->insertItem(tr("Custom Auto Response..."), mnuUserCustomAutoResponse); mnuUser->insertSeparator(); QPopupMenu *m = new QPopupMenu(this); - m->insertItem(tr("&General Info"), mnuUserGeneral); - m->insertItem(tr("&More Info"), mnuUserMore); - m->insertItem(tr("&Work Info"), mnuUserWork); - m->insertItem(tr("&About"), mnuUserAbout); + m->insertItem(pmMenuInfo, tr("&General Info"), mnuUserGeneral); + m->insertItem(pmMenuMore, tr("&More Info"), mnuUserMore); + m->insertItem(pmMenuWork, tr("&Work Info"), mnuUserWork); + m->insertItem(pmMenuAbout, tr("&About"), mnuUserAbout); m->insertItem(tr("&Last"), mnuUserLast); connect (m, SIGNAL(activated(int)), this, SLOT(callUserFunction(int))); mnuUser->insertItem(pmInfo, tr("&Info"), m); mnuUser->insertItem(pmHistory, tr("View &History"), mnuUserHistory); - mnuUser->insertItem(tr("Toggle &Floaty"), mnuUserFloaty); - mnuUser->insertItem(tr("Edit User Group"), mnuGroup); + mnuUser->insertItem(pmFloaty, tr("Toggle &Floaty"), mnuUserFloaty); + mnuUser->insertItem(pmGroup, tr("Edit User Group"), mnuGroup); mnuUser->insertSeparator(); - mnuUser->insertItem(tr("Remove From List"), mnuUserRemoveFromList); + mnuUser->insertItem(pmRemove, tr("Remove From List"), mnuUserRemoveFromList); connect (mnuUser, SIGNAL(activated(int)), this, SLOT(callUserFunction(int))); connect (mnuUser, SIGNAL(aboutToShow()), this, SLOT(slot_usermenu())); } diff -urN -x CVS licq/plugins/qt-gui/src/mainwin.h licq.patched/plugins/qt-gui/src/mainwin.h --- licq/plugins/qt-gui/src/mainwin.h Mon Sep 30 02:04:39 2002 +++ licq.patched/plugins/qt-gui/src/mainwin.h Wed Oct 2 13:31:11 2002 @@ -185,7 +185,9 @@ char *m_szIconSet; QPixmap pmOnline, pmOffline, pmAway, pmDnd, pmOccupied, pmNa, pmPrivate, pmFFC, pmMessage, pmUrl, pmChat, pmFile, pmContact, pmSms, - pmAuthorize, pmSMS, pmSecureOn, pmSecureOff, pmHistory, pmInfo, pmEncoding; + pmAuthorize, pmSMS, pmSecureOn, pmSecureOff, pmHistory, pmFloaty, pmGroup, pmRemove, pmInfo, pmEncoding, + pmSysMsg, pmSecurity, pmExit, pmHelp, pmOptions, pmContactList, pmAddUser, + pmMenuInfo, pmMenuMore, pmMenuWork, pmMenuAbout; unsigned long m_nUserMenuUin; unsigned int positionChanges; diff -urN -x CVS licq/plugins/qt-gui/src/xpm/adduser.xpm licq.patched/plugins/qt-gui/src/xpm/adduser.xpm --- licq/plugins/qt-gui/src/xpm/adduser.xpm Thu Jan 1 01:00:00 1970 +++ licq.patched/plugins/qt-gui/src/xpm/adduser.xpm Tue Aug 13 14:39:08 2002 @@ -0,0 +1,32 @@ +/* XPM */ +static const char * adduser_xpm[] = { +"16 16 13 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #00007D", +"# c #808000", +"$ c #009A9A", +"% c #008000", +"& c #FFFF00", +"* c #F3F3F3", +"= c #423F3F", +"- c #BEBEBE", +"; c #80807F", +"> c #FF0000", +" .... ", +" +++++.@@@@.++# ", +" ++++.@@$$$+.#% ", +" +++&.@$%$$*.## ", +" ++&+.@$$=$-.#% ", +" +++&.@$$%$*.## ", +" ++&+&.@*+*.;#% ", +" +++&+&....-.;# ", +" ++&+&+&+&+&-.; ", +" +++...+&+&+&-.;", +" ++&.>.&+&+&+#-.", +" +...>...+&+&#% ", +" +.>>>>>.&+&+## ", +" +...>...###%#% ", +" +##.>.##%##### ", +" ... "}; diff -urN -x CVS licq/plugins/qt-gui/src/xpm/contactlist.xpm licq.patched/plugins/qt-gui/src/xpm/contactlist.xpm --- licq/plugins/qt-gui/src/xpm/contactlist.xpm Thu Jan 1 01:00:00 1970 +++ licq.patched/plugins/qt-gui/src/xpm/contactlist.xpm Tue Aug 13 14:32:08 2002 @@ -0,0 +1,30 @@ +/* XPM */ +static const char * contactlist_xpm[] = { +"16 16 11 1", +" c None", +". c #FFFFFF", +"+ c #00007D", +"@ c #000000", +"# c #6B6F6B", +"$ c #5D5D5D", +"% c #D4D0C8", +"& c #CACACA", +"* c #00FF00", +"= c #0000FF", +"- c #FF0000", +" .......... ", +" .++++++++@# ", +" .$#$$#$$#@$ ", +" .%&%%&%%&@# ", +" .**====&&@$ ", +" .&&&&&&&&@# ", +" --#*====&&@$ ", +" ----#&&&&&&@# ", +" -#.-$====&&@$ ", +" --#&&&&&&@# ", +" --#&----&&@$ ", +" --#$#$#$##@# ", +" .........@$ ", +" --#&&#.&&#@# ", +" --$#$#.#$#@$ ", +" .@@@@@@@@@# "}; diff -urN -x CVS licq/plugins/qt-gui/src/xpm/exit.xpm licq.patched/plugins/qt-gui/src/xpm/exit.xpm --- licq/plugins/qt-gui/src/xpm/exit.xpm Thu Jan 1 01:00:00 1970 +++ licq.patched/plugins/qt-gui/src/xpm/exit.xpm Tue Aug 13 14:20:08 2002 @@ -0,0 +1,26 @@ +/* XPM */ +static const char * exit_xpm[] = { +"16 16 7 1", +" c None", +". c #FFFFFF", +"+ c #808000", +"@ c #008000", +"# c #FF0000", +"$ c #FFFF00", +"% c #800080", +" ", +" .............+ ", +" ............+@ ", +" .#.$.$.$.$.$++ ", +"####.$.$.$.$#%+ ", +" ####.$.$###$+@ ", +" .####.####$.++ ", +" ..#######$.$@+ ", +" ..$#####$.$.++ ", +" .#######.$.$+@ ", +" ####$####.$.++ ", +"###.$.$###$.$@+ ", +" #.$.$.$###$.++ ", +" ..++++@+###+@+ ", +" .+@+@++++%##++ ", +" #% "}; diff -urN -x CVS licq/plugins/qt-gui/src/xpm/floaty.xpm licq.patched/plugins/qt-gui/src/xpm/floaty.xpm --- licq/plugins/qt-gui/src/xpm/floaty.xpm Thu Jan 1 01:00:00 1970 +++ licq.patched/plugins/qt-gui/src/xpm/floaty.xpm Tue Aug 13 13:05:01 2002 @@ -0,0 +1,25 @@ +/* XPM */ +static const char * floaty_xpm[] = { +"16 16 6 1", +" c None", +". c #000000", +"+ c #C6C6C6", +"@ c #848484", +"# c #848400", +"$ c #FFFF00", +" ", +" .. ", +" .+.. ", +" .+...@ ", +" .+..++#...... ", +".+..++$$$$$$$+. ", +"@..$++$$$$$$$$@.", +"..$++$$$$$$$$$@.", +"#.+$$$$$$$$$$+..", +" #.++++++$$$+.+.", +" #......@$+.+..", +" .+.+.. ", +" .+.. ", +" .. ", +" . ", +" "}; diff -urN -x CVS licq/plugins/qt-gui/src/xpm/group.xpm licq.patched/plugins/qt-gui/src/xpm/group.xpm --- licq/plugins/qt-gui/src/xpm/group.xpm Thu Jan 1 01:00:00 1970 +++ licq.patched/plugins/qt-gui/src/xpm/group.xpm Tue Aug 13 13:31:53 2002 @@ -0,0 +1,25 @@ +/* XPM */ +static const char * group_xpm[] = { +"16 16 6 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #FFFF00", +"# c #000080", +"$ c #808080", +" ... ", +" .+@+. ", +"......... ", +".@@@@@@@. ### ", +".@@+@+@@. $# ", +".@+@+@+@. # ", +".@@@@@@@. #####", +"........$ ### ", +" ... # ", +" .+@+. ", +" ..........", +" .@@@@@@@@.", +" .@@+@+@+@.", +" .@+@+@+@@.", +" .@@@@@@@@.", +" .........."}; diff -urN -x CVS licq/plugins/qt-gui/src/xpm/help.xpm licq.patched/plugins/qt-gui/src/xpm/help.xpm --- licq/plugins/qt-gui/src/xpm/help.xpm Thu Jan 1 01:00:00 1970 +++ licq.patched/plugins/qt-gui/src/xpm/help.xpm Tue Aug 13 14:25:23 2002 @@ -0,0 +1,29 @@ +/* XPM */ +static const char * help_xpm[] = { +"16 16 10 1", +" c None", +". c #800080", +"+ c #000000", +"@ c #FFFFFF", +"# c #80807F", +"$ c #808000", +"% c #00007D", +"& c #008000", +"* c #FFFF00", +"= c #BEBEBE", +" .+ ", +" @@@@@.#.++@@@$ ", +" @@@@.#%...++$& ", +" @@*.#..%.%..++ ", +" @@.#%.***$.%.+ ", +" @.#..&$.**..++ ", +" .#%...=**%.+#+ ", +".#..%.*&...+#=++", +".++..%...%+#==.+", +".##++..+.+#==.+ ", +".#@##++.+#==.+$ ", +"+#=@@##+#==.+$& ", +" ++#=@@#==.+@$$ ", +" @@++#=@=.+$$&$ ", +" @$$$++#.+$&$$$ ", +" ++ "}; diff -urN -x CVS licq/plugins/qt-gui/src/xpm/history.xpm licq.patched/plugins/qt-gui/src/xpm/history.xpm --- licq/plugins/qt-gui/src/xpm/history.xpm Wed Jun 7 01:23:54 2000 +++ licq.patched/plugins/qt-gui/src/xpm/history.xpm Tue Aug 13 13:11:43 2002 @@ -1,66 +1,25 @@ /* XPM */ static const char * history_xpm[] = { -"16 16 47 1", +"16 16 6 1", " c None", ". c #000000", -"+ c #FFEFAC", -"@ c #FFEEAA", -"# c #FFEEA9", -"$ c #FFECA0", -"% c #FFEC9E", -"& c #FFEC9C", -"* c #FFEB9A", -"= c #FFEEA8", -"- c #FFEEA6", -"; c #FFEC9D", -"> c #FFEB96", -", c #FFEA95", -"' c #FFEDA4", -") c #FFEC9B", -"! c #FFEB98", -"~ c #FFEA94", -"{ c #FFEA92", -"] c #FFEB99", -"^ c #FFEB97", -"/ c #FFE889", -"( c #FFEB95", -"_ c #FFEA93", -": c #FFE98A", -"< c #FFE887", -"[ c #FFE886", -"} c #FFE885", -"| c #FFEA91", -"1 c #FFEA8F", -"2 c #FFE884", -"3 c #FFE783", -"4 c #FFE98D", -"5 c #FFE780", -"6 c #FFEA90", -"7 c #FFE98E", -"8 c #FFE98B", -"9 c #FFE782", -"0 c #FFE77E", -"a c #FFE67C", -"b c #FFE98C", -"c c #FFE888", -"d c #FFE67E", -"e c #FFE67A", -"f c #FFE67B", -"g c #FFE578", -"h c #FFE989", +"+ c #848400", +"@ c #FFFFFF", +"# c #008400", +"$ c #FFFF00", " ", -" ......... ", -" .+@#$%&*.. ", -" .+@=-;&*.>,. ", -" .@=-')*!.~{. ", -" .)]^.../... ", -" .]^(_:/<. ", -" .^(...[}. ", -" .~_|1[23. ", -" .{..42.5. ", -" .6748950. ", -" .......0a. ", -" .67b:c c #3446A1", -", c #445EA9", -"' c #5F81EE", -") c #5B7BEB", -"! c #5776E8", -"~ c #617CE7", -"{ c #5973E4", -"] c #4760DD", -"^ c #435ADB", -"/ c #2C3B98", -"( c #BDC8F4", -"_ c #9BA9EE", -": c #3F55D8", -"< c #3B4FD5", -"[ c #29369A", -"} c #5370E5", -"| c #4F6BE3", -"1 c #94A3EC", -"2 c #7C8DE6", -"3 c #435ADA", -"4 c #3849D2", -"5 c #3444D0", -"6 c #6079E6", -"7 c #93A3EC", -"8 c #91A0EB", -"9 c #6B7DE2", -"0 c #3C4FD5", -"a c #303FCD", -"b c #202A92", -"c c #4F6AE3", -"d c #687EE5", -"e c #C1C9F3", -"f c #E0E4F8", -"g c #A4AEEC", -"h c #303ECD", -"i c #2C39CA", -"j c #1D2590", -"k c #435BDB", -"l c #A6B0ED", -"m c #A3ACEB", -"n c #2933C8", -"o c #1B218E", -"p c #A4ADEB", -"q c #A1A9EA", -"r c #3443D0", -"s c #2833C8", -"t c #242DC5", -"u c #181D8C", -"v c #5C6FDE", -"w c #7D8BE3", -"x c #C1C7F1", -"y c #BFC4F0", -"z c #757FDE", -"A c #4C57D2", -"B c #242EC5", -"C c #2128C2", -"D c #7885E2", -"E c #BDC2EF", -"F c #BCC1EE", -"G c #BBBFEE", -"H c #6A71D8", -"I c #2028C2", -"J c #151A8C", -"K c #3D4DD3", -"L c #3F4ED2", -"M c #3B48CF", -"N c #3743CD", -"O c #333DCA", -"P c #2A32C6", -"Q c #151987", +". c #000000", +"+ c #FFFFFF", +"@ c #FFFF00", +"# c #848484", +"$ c #C6C6C6", +"% c #000084", " ", -" .+@# ", -" $%&*=-;> ", -" ,')!~{;]^/ ", -" $'&!=(_]^:<[ ", -" %)!}|123:<45 ", -" .&!=6789:045ab ", -" +*}cdefg<45hij ", -" @=|;]klm45aino ", -" #-;]3:pqrhistu ", -" ;]^vwxyzAsBC ", -" >^:DyEFGHtIJ ", -" / c #AFB6FF", +" ... ", +" ..+. ", +" ..@. ", +"........+.......", +".#$%$%$.&.$%$%$.", +".*%$%$%.+.....%.", +".#$%$%$...====..", +".$%$%$%$.-=.;=;.", +".#....$%.==.....", +".*%$%$%$.-=...%.", +".#...%....====..", +".$%$%$%$%$...==.", +".#*#$#*#...#.==.", +".........;-..=;.", +" .>=>;. ", +" .... "};