diff -urN plugins/qt-gui/src/mainwin.cpp.orig plugins/qt-gui/src/mainwin.cpp --- plugins/qt-gui/src/mainwin.cpp.orig Fri Aug 16 13:45:07 2002 +++ plugins/qt-gui/src/mainwin.cpp Sat Aug 17 16:58:33 2002 @@ -2935,6 +2935,46 @@ pmSMS.load(sFilepath); if(pmSMS.isNull()) pmSMS = pmMessage; + fIconsConf.ReadStr("Phone", sFilename, ""); + snprintf(sFilepath, MAX_FILENAME_LEN - 1, "%s%s", sIconPath, sFilename); + pmPhone.load(sFilepath); + + fIconsConf.ReadStr("Cellular", sFilename, ""); + snprintf(sFilepath, MAX_FILENAME_LEN - 1, "%s%s", sIconPath, sFilename); + pmCellular.load(sFilepath); + + fIconsConf.ReadStr("Birthday", sFilename, ""); + snprintf(sFilepath, MAX_FILENAME_LEN - 1, "%s%s", sIconPath, sFilename); + pmBirthday.load(sFilepath); + + fIconsConf.ReadStr("CustomAR", sFilename, ""); + snprintf(sFilepath, MAX_FILENAME_LEN - 1, "%s%s", sIconPath, sFilename); + pmCustomAR.load(sFilepath); + + fIconsConf.ReadStr("Invisible", sFilename, ""); + snprintf(sFilepath, MAX_FILENAME_LEN - 1, "%s%s", sIconPath, sFilename); + pmInvisible.load(sFilepath); + + fIconsConf.ReadStr("Phone", sFilename, ""); + snprintf(sFilepath, MAX_FILENAME_LEN - 1, "%s%s", sIconPath, sFilename); + pmPhone.load(sFilepath); + + fIconsConf.ReadStr("Cellular", sFilename, ""); + snprintf(sFilepath, MAX_FILENAME_LEN - 1, "%s%s", sIconPath, sFilename); + pmCellular.load(sFilepath); + + fIconsConf.ReadStr("Birthday", sFilename, ""); + snprintf(sFilepath, MAX_FILENAME_LEN - 1, "%s%s", sIconPath, sFilename); + pmBirthday.load(sFilepath); + + fIconsConf.ReadStr("CustomAR", sFilename, ""); + snprintf(sFilepath, MAX_FILENAME_LEN - 1, "%s%s", sIconPath, sFilename); + pmCustomAR.load(sFilepath); + + fIconsConf.ReadStr("Invisible", sFilename, ""); + snprintf(sFilepath, MAX_FILENAME_LEN - 1, "%s%s", sIconPath, sFilename); + pmInvisible.load(sFilepath); + if (!_bInitial) { mnuStatus->changeItem(pmOnline, tr("&Online"), ICQ_STATUS_ONLINE); diff -urN plugins/qt-gui/src/mainwin.h.orig plugins/qt-gui/src/mainwin.h --- plugins/qt-gui/src/mainwin.h.orig Fri Aug 16 13:45:07 2002 +++ plugins/qt-gui/src/mainwin.h Sat Aug 17 16:58:33 2002 @@ -184,7 +184,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, pmInfo, pmEncoding, + pmBirthday, pmPhone, pmCellular, pmInvisible, pmCustomAR; + unsigned long m_nUserMenuUin; unsigned int positionChanges; diff -urN plugins/qt-gui/src/userbox.cpp plugins/qt-gui/src/userbox.cpp --- plugins/qt-gui/src/userbox.cpp.orig Wed Jul 24 13:45:04 2002 +++ plugins/qt-gui/src/userbox.cpp Sat Aug 17 16:58:46 2002 @@ -759,11 +759,46 @@ pixCollapsed = new QPixmap(itemCollapsed_xpm); pixExpanded = new QPixmap(itemExpanded_xpm); - pixBirthday = new QPixmap(pixBirthday_xpm); - pixCustomAR = new QPixmap(pixCustomAR_xpm); - pixPhone = new QPixmap(pixPhone_xpm); - pixCellular = new QPixmap(pixCellular_xpm); - pixInvisible = new QPixmap(pixInvisible_xpm); + if (gMainWindow->pmBirthday.isNull()) + { + pixBirthday = new QPixmap(pixBirthday_xpm); + } + else + { + pixBirthday = new QPixmap(gMainWindow->pmBirthday); + } + if (gMainWindow->pmCustomAR.isNull()) + { + pixCustomAR = new QPixmap(pixCustomAR_xpm); + } + else + { + pixCustomAR = new QPixmap(gMainWindow->pmCustomAR); + } + if (gMainWindow->pmPhone.isNull()) + { + pixPhone = new QPixmap(pixPhone_xpm); + } + else + { + pixPhone = new QPixmap(gMainWindow->pmPhone); + } + if (gMainWindow->pmCellular.isNull()) + { + pixCellular = new QPixmap(pixCellular_xpm); + } + else + { + pixCellular = new QPixmap(gMainWindow->pmCellular); + } + if (gMainWindow->pmInvisible.isNull()) + { + pixInvisible = new QPixmap(pixInvisible_xpm); + } + else + { + pixInvisible = new QPixmap(gMainWindow->pmInvisible); + } if (parent != NULL) {