diff options
| author |  Elvio Basello | 2011-01-05 22:54:21 +0000 |
|---|---|---|
| committer | Elvio Basello | 2011-01-05 22:54:21 +0000 |
| commit | 12fba74234ec39059b1043c2febcc983fd7cbaf6 (patch) | |
| tree | ae5f7f58c546feac36742c2b12ae1a36cc24d5a1 | |
| parent | Another fix for the options instance generation script (diff) | |
| download | KVIrc-12fba74234ec39059b1043c2febcc983fd7cbaf6.tar.gz KVIrc-12fba74234ec39059b1043c2febcc983fd7cbaf6.tar.bz2 KVIrc-12fba74234ec39059b1043c2febcc983fd7cbaf6.zip | |
reworked icon stuff
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5301 17fca916-40b9-46aa-a4ea-0a15b648b75c
140 files changed, 1935 insertions, 1520 deletions
diff --git a/doc/TODO-docs b/doc/TODO-docs index 6e3c8a5e0..1a848fd08 100644 --- a/doc/TODO-docs +++ b/doc/TODO-docs @@ -364,7 +364,7 @@ videoinput.h KviKvs.cpp KviKvs.h KviKvsAction.cpp - KviKvsAction.h +++KviKvsAction.h KviKvsAliasManager.cpp KviKvsAliasManager.h KviKvsArray.cpp @@ -744,8 +744,8 @@ videoinput.h KviWindow.h KviWindowListBase.cpp KviWindowListBase.h - KviWindowToolWidget.cpp - KviWindowToolWidget.h +++KviWindowToolWidget.cpp ++ KviWindowToolWidget.h ################# @@ -1200,8 +1200,8 @@ videoinput.h # modules/options # ################### - OptionsInstanceManager.cpp - OptionsInstanceManager.h +++OptionsInstanceManager.cpp ++ OptionsInstanceManager.h OptionsWidgetContainer.cpp OptionsWidgetContainer.h OptionsWidget_alertsAndHighlighting.cpp @@ -1438,9 +1438,9 @@ videoinput.h # modules/socketspy # ##################### + SocketSpyWindow.cpp + SocketSpyWindow.h libkvisocketspy.cpp - socketspywindow.cpp - socketspywindow.h ################## diff --git a/src/kvilib/core/KviError.cpp b/src/kvilib/core/KviError.cpp index b0ba5af8c..9721c1f74 100644 --- a/src/kvilib/core/KviError.cpp +++ b/src/kvilib/core/KviError.cpp @@ -173,7 +173,7 @@ namespace KviError { const char * getUntranslatedDescription(KviError::Code eError) { - if((eError < KviError::ErrorCount) && (eError >= 0)) + if((eError < ErrorCount) && (eError >= 0)) return g_errorTable[eError]; #ifdef HAVE_STRERROR if(eError < 0) diff --git a/src/kvirc/kernel/KviAction.cpp b/src/kvirc/kernel/KviAction.cpp index f3003d997..a48788dcc 100644 --- a/src/kvirc/kernel/KviAction.cpp +++ b/src/kvirc/kernel/KviAction.cpp @@ -26,7 +26,6 @@ #include "KviCustomToolBar.h" #include "KviMainWindow.h" #include "KviIrcContext.h" -#include "KviIconManager.h" #include "KviApplication.h" #include "KviWindow.h" #include "KviChannelWindow.h" @@ -50,6 +49,11 @@ KviAction::KviAction(QObject * pParent, const QString & szName, const QString & { } +KviAction::KviAction(QObject * pParent, const QString & szName, const QString & szVisibleName, const QString & szDescription, KviActionCategory * pCategory, const QString & szBigIconId, const KviIconManager::SmallIcon eIcon, unsigned int uFlags, const QString & szKeySequence) +: QObject(pParent),m_szName(szName),m_szVisibleName(szVisibleName),m_szDescription(szDescription),m_pCategory(pCategory),m_szBigIconId(szBigIconId),m_eIcon(eIcon),m_pWidgetList(NULL),m_uInternalFlags(KviAction::Enabled),m_uFlags(uFlags),m_szKeySequence(szKeySequence),m_pAccel(NULL) +{ +} + KviAction::~KviAction() { if(m_pWidgetList) diff --git a/src/kvirc/kernel/KviAction.h b/src/kvirc/kernel/KviAction.h index 4ba2057cc..dca0d1d08 100644 --- a/src/kvirc/kernel/KviAction.h +++ b/src/kvirc/kernel/KviAction.h @@ -32,6 +32,7 @@ #include "kvi_settings.h" #include "KviPointerList.h" +#include "KviIconManager.h" #include <QObject> @@ -40,6 +41,8 @@ class QPixmap; class KviTalPopupMenu; class KviCustomToolBar; +#undef None + /** * \class KviActionCategory * \brief Holds the categories of an action @@ -119,7 +122,7 @@ public: EnableAtLogin = 64, /**< the action is enabled at login; implies NeedsConnection */ WindowOnlyIfUsersSelected = 128 /**< the action is bound to a window only if it's selected by the user; implies at least one of WindowConsole | WindowChannel | WindowQuery */ }; -public: + /** * \brief Constructs the action object * \param pParent The parent object @@ -141,6 +144,8 @@ public: */ KviAction(QObject * pParent, const QString & szName, const QString & szVisibleName, const QString & szDescription, KviActionCategory * pCategory = NULL, const QString & szBigIconId = QString(), const QString & szSmallIconId = QString(), unsigned int uFlags = 0, const QString & szKeySequence = QString()); + KviAction(QObject * pParent, const QString & szName, const QString & szVisibleName, const QString & szDescription, KviActionCategory * pCategory = NULL, const QString & szBigIconId = QString(), const KviIconManager::SmallIcon eIcon = KviIconManager::None, unsigned int uFlags = 0, const QString & szKeySequence = QString()); + /** * \brief Destroys the action object */ @@ -152,6 +157,7 @@ protected: KviActionCategory * m_pCategory; QString m_szBigIconId; QString m_szSmallIconId; + QString m_eIcon; KviPointerList<QWidget> * m_pWidgetList; unsigned short int m_uInternalFlags; unsigned int m_uFlags; @@ -235,13 +241,13 @@ public: /** * \brief Returns the small icon associated to the action - * \return const QString & + * \return QPixmap * */ QPixmap * smallIcon(); /** * \brief Returns the big icon associated to the action - * \return const QString & + * \return QPixmap * */ QPixmap * bigIcon(); diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp index 754282dd0..17fbbc868 100644 --- a/src/kvirc/kernel/KviApplication.cpp +++ b/src/kvirc/kernel/KviApplication.cpp @@ -756,7 +756,7 @@ Let's see the scheme to understand which is choosen: actions << __tr2qs("View"); actions << __tr2qs("Ignore"); - QPixmap * pIcon = g_pIconManager->getSmallIcon(16); + QPixmap * pIcon = g_pIconManager->getSmallIcon(KviIconManager::KVIrc); KNotification * pNotify = new KNotification("kvirc"); pNotify->setFlags(KNotification::Persistent); @@ -779,19 +779,20 @@ Let's see the scheme to understand which is choosen: if(!pWnd) return; + QString szIcon = g_pIconManager->getSmallIconName(KviIconManager::KVIrc); QString szText = __tr2qs("Message arriving from %1:\n\n").arg(pWnd->target()); szText += KviMircCntrl::stripControlBytes(szMsg); // org.freedesktop.Notifications.Notify QVariantList args; - args << QString("KVIrc"); // application name - args << QVariant(QVariant::UInt); // notification id - args << QString(g_pIconManager->getSmallIconName(16)); // application icon - args << __tr2qs("KVIrc messaging system"); // summary text - args << szText; // detailed text - args << QStringList(); // actions, optional - args << QVariantMap(); // hints, optional - args << (int)uMessageLifetime*1000; // timeout in msecs + args << QString("KVIrc"); // application name + args << QVariant(QVariant::UInt); // notification id + args << szIcon; // application icon + args << __tr2qs("KVIrc messaging system"); // summary text + args << szText; // detailed text + args << QStringList(); // actions, optional + args << QVariantMap(); // hints, optional + args << (int)uMessageLifetime*1000; // timeout in msecs QDBusInterface * pNotify = new QDBusInterface("org.freedesktop.Notifications","/org/freedesktop/Notifications","org.freedesktop.Notifications",QDBusConnection::sessionBus(),this); QDBusMessage reply = pNotify->callWithArgumentList(QDBus::Block,"Notify",args); @@ -1118,7 +1119,7 @@ void KviApplication::fileDownloadTerminated(bool bSuccess, const QString & szRem int iIconId; if(!bSuccess) { - iIconId = KVI_SMALLICON_DCCERROR; + iIconId = KviIconManager::DccError; if(szNick.isEmpty()) szMsg = __tr2qs("File download failed"); else @@ -1129,7 +1130,7 @@ void KviApplication::fileDownloadTerminated(bool bSuccess, const QString & szRem szMsg += szLocalFileName; szMsg += ")"; } else { - iIconId = KVI_SMALLICON_DCCMSG; + iIconId = KviIconManager::DccMsg; if(szNick.isEmpty()) szMsg = __tr2qs("File download successfully complete"); else @@ -1969,7 +1970,7 @@ void KviApplication::fillRecentServersPopup(KviTalPopupMenu * pMenu) { if(*it == "") continue; - pMenu->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),*it); + pMenu->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Server)),*it); } } @@ -1982,7 +1983,7 @@ void KviApplication::fillRecentNicknamesPopup(KviTalPopupMenu * pMenu, KviConsol { if(*it == "") continue; - iId = pMenu->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICK)),*it); + iId = pMenu->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Nick)),*it); if(!pConsole->isConnected()) pMenu->setItemEnabled(iId,false); else { @@ -2007,7 +2008,7 @@ void KviApplication::fillRecentChannelsPopup(KviTalPopupMenu * pMenu, KviConsole { if(*it == "") continue; // ? - int iId = pMenu->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),*it); + int iId = pMenu->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)),*it); if(!pConsole->isConnected()) pMenu->setItemEnabled(iId,false); else diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp index b92444e09..2a06f016d 100644 --- a/src/kvirc/kernel/KviCoreActions.cpp +++ b/src/kvirc/kernel/KviCoreActions.cpp @@ -96,7 +96,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Allows you to configure the servers and eventually to connect to them"), KviActionManager::categorySettings(), "kvi_bigicon_servers.png", - KVI_SMALLICON_SERVER, + KviIconManager::Server, 0, KVI_SHORTCUTS_SERVERS); @@ -107,7 +107,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Allows you to manage the script-based addons"), KviActionManager::categorySettings(), "kvi_bigicon_addons.png", - KVI_SMALLICON_ADDONS, + KviIconManager::Addons, 0, KVI_SHORTCUTS_MANAGE_ADDONS); @@ -118,7 +118,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a dialog that allows editing the registered user entries"), KviActionManager::categorySettings(), "kvi_bigicon_regusers.png", - KVI_SMALLICON_REGUSERS, + KviIconManager::RegUsers, 0, KVI_SHORTCUTS_USERS); @@ -129,7 +129,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Allows you to configure nickname, username, avatar etc..."), KviActionManager::categorySettings(), "kvi_bigicon_identity.png", - KVI_SMALLICON_WHO, + KviIconManager::Who, 0, KVI_SHORTCUTS_IDENTITY); @@ -140,7 +140,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows monitoring the socket traffic"), KviActionManager::categoryScripting(), "kvi_bigicon_socketspy.png", - KVI_SMALLICON_SPY, + KviIconManager::Spy, KviAction::NeedsContext, QString()); @@ -151,7 +151,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows viewing the network links"), KviActionManager::categoryIrc(), "kvi_bigicon_networklinks.png", - KVI_SMALLICON_LINKS, + KviIconManager::Links, KviAction::NeedsContext, QString()); @@ -162,7 +162,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows listing the network channels"), KviActionManager::categoryIrc(), "kvi_bigicon_channellist.png", - KVI_SMALLICON_LIST, + KviIconManager::List, KviAction::NeedsContext, QString()); @@ -173,7 +173,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows the general options dialog"), KviActionManager::categorySettings(), "kvi_bigicon_settings.png", - KVI_SMALLICON_OPTIONS, + KviIconManager::Options, 0, KVI_SHORTCUTS_OPTIONS); @@ -184,7 +184,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows the theme options dialog"), KviActionManager::categorySettings(), "kvi_bigicon_themeoptions.png", - KVI_SMALLICON_THEMEOPTIONS, + KviIconManager::ThemeOptions, 0, KVI_SHORTCUTS_THEME); @@ -195,7 +195,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Allows you to manage the themes"), KviActionManager::categorySettings(), "kvi_bigicon_theme.png", - KVI_SMALLICON_THEME, + KviIconManager::Theme, 0, KVI_SHORTCUTS_MANAGE_THEMES); @@ -206,7 +206,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows editing script toolbars"), KviActionManager::categorySettings(), "kvi_bigicon_toolbareditor.png", - KVI_SMALLICON_TOOLBAR, + KviIconManager::ToolBar, 0, KVI_SHORTCUTS_EDITORS_TOOLBAR); @@ -217,7 +217,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a dialog that allows you join channels"), KviActionManager::categoryIrc(), "kvi_bigicon_channels.png", - KVI_SMALLICON_CHANNEL, + KviIconManager::Channel, KviKvsAction::NeedsConnection | KviKvsAction::NeedsContext, KVI_SHORTCUTS_JOIN); @@ -228,7 +228,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows editing actions"), KviActionManager::categoryScripting(), "kvi_bigicon_actioneditor.png", - KVI_SMALLICON_SCRIPTACTION, + KviIconManager::ScriptAction, 0, KVI_SHORTCUTS_EDITORS_ACTION); @@ -239,7 +239,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows editing aliases"), KviActionManager::categoryScripting(), "kvi_bigicon_aliaseditor.png", - KVI_SMALLICON_ALIAS, + KviIconManager::Alias, 0, KVI_SHORTCUTS_EDITORS_ALIAS); @@ -250,7 +250,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows editing classes"), KviActionManager::categoryScripting(), "kvi_bigicon_classeditor.png", - KVI_SMALLICON_CLASSEDITOR, + KviIconManager::ClassEditor, 0, KVI_SHORTCUTS_EDITORS_CLASS); @@ -261,7 +261,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows editing script events"), KviActionManager::categoryScripting(), "kvi_bigicon_eventeditor.png", - KVI_SMALLICON_EVENT, + KviIconManager::Event, 0, KVI_SHORTCUTS_EDITORS_EVENT); @@ -272,7 +272,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows editing popup menus"), KviActionManager::categoryScripting(), "kvi_bigicon_popupeditor.png", - KVI_SMALLICON_POPUP, + KviIconManager::Popup, 0, KVI_SHORTCUTS_EDITORS_POPUP); @@ -283,7 +283,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows a window that allows editing raw scripting events"), KviActionManager::categoryScripting(), "kvi_bigicon_raweditor.png", - KVI_SMALLICON_RAWEVENT, + KviIconManager::RawEvent, 0, KVI_SHORTCUTS_EDITORS_RAW); @@ -294,7 +294,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Creates an embedded editor for long scripts"), KviActionManager::categoryScripting(), "kvi_bigicon_codetester.png", - KVI_SMALLICON_BOMB, + KviIconManager::Bomb, 0, KVI_SHORTCUTS_EDITORS_TESTER); @@ -305,7 +305,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Allows executing a KVS script from file"), KviActionManager::categoryScripting(), "kvi_bigicon_folder.png", - KVI_SMALLICON_FOLDER, + KviIconManager::Folder, 0, KVI_SHORTCUTS_EXEC); @@ -316,7 +316,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Shows the documentation index"), KviActionManager::categoryGeneric(), "kvi_bigicon_help.png", - KVI_SMALLICON_HELP, + KviIconManager::Help, 0, KVI_SHORTCUTS_HELP); @@ -327,7 +327,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Allows subscribing to the KVIrc mailing list"), KviActionManager::categoryGeneric(), "kvi_bigicon_mailinglist.png", - KVI_SMALLICON_MESSAGE, + KviIconManager::Message, 0, QString()); @@ -338,7 +338,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Opens the KVIrc homepage"), KviActionManager::categoryGeneric(), "kvi_bigicon_kvircwww.png", - KVI_SMALLICON_KVIRC, + KviIconManager::KVIrc, 0, QString()); @@ -349,7 +349,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Opens the KVIrc homepage in russian"), KviActionManager::categoryGeneric(), "kvi_bigicon_kvircwww.png", - KVI_SMALLICON_KVIRC, + KviIconManager::KVIrc, 0, QString()); @@ -360,7 +360,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Acquires a Screenshot of the KVIrc main window"), KviActionManager::categoryGeneric(), "kvi_bigicon_screenshot.png", - KVI_SMALLICON_SCREENSHOT, + KviIconManager::ScreenShot, 0, QString()); @@ -373,7 +373,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Arranges the MDI windows in a maximized-cascade fashion"), KviActionManager::categoryGUI(), "kvi_bigicon_cascadewindows.png", - KVI_SMALLICON_CASCADEWINDOWS, + KviIconManager::CascadeWindows, 0, QString()); @@ -385,7 +385,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Tiles the MDI windows with the currently selected tile method"), KviActionManager::categoryGUI(), "kvi_bigicon_tilewindows.png", - KVI_SMALLICON_TILEWINDOWS, + KviIconManager::TileWindows, 0, QString()); @@ -397,7 +397,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Minimized all the currently visible MDI windows"), KviActionManager::categoryGUI(), "kvi_bigicon_minimizeallwindows.png", - KVI_SMALLICON_MINIMIZE, + KviIconManager::Minimize, 0, QString()); @@ -409,7 +409,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Creates a new IRC context console"), KviActionManager::categoryIrc(), "kvi_bigicon_newirccontext.png", - KVI_SMALLICON_CONSOLE, + KviIconManager::Console, 0, KVI_SHORTCUTS_CONTEXT); @@ -421,7 +421,7 @@ void register_core_actions(KviActionManager * m) __tr2qs("Quits KVIrc closing all the current connections"), KviActionManager::categoryGeneric(), "kvi_bigicon_quit.png", - KVI_SMALLICON_QUITAPP, + KviIconManager::QuitApp, 0, QString()); } @@ -434,7 +434,7 @@ KviIrcContextDisplayAction::KviIrcContextDisplayAction(QObject * pParent) __tr2qs("Shows a small display with IRC context information"), KviActionManager::categoryIrc(), "kvi_bigicon_irccontextdisplay.png", - KVI_SMALLICON_NONE, + KviIconManager::None, NeedsContext | NeedsConnection) { } @@ -497,7 +497,7 @@ KviSeparatorAction::KviSeparatorAction(QObject * pParent) __tr2qs("Acts as a separator for other items: performs no action"), KviActionManager::categoryGeneric(), KVI_BIGICON_SEPARATOR, - KVI_SMALLICON_NONE, + KviIconManager::None, 0) { } @@ -527,7 +527,7 @@ KviConnectAction::KviConnectAction(QObject * pParent) __tr2qs("Allows you to connect to a server or to terminate the current connection"), KviActionManager::categoryIrc(), KVI_BIGICON_CONNECTED, - KVI_SMALLICON_NONE, // no small icon for now + KviIconManager::None, // no small icon for now NeedsContext | NeedsConnection, QString(KVI_SHORTCUTS_CONNECT)) { @@ -605,7 +605,8 @@ void KviConnectAction::setup() void KviConnectAction::activate() { KviIrcContext * c = g_pFrame->activeContext(); - if(c)c->connectOrDisconnect(); + if(c) + c->connectOrDisconnect(); } bool KviConnectAction::addToPopupMenu(KviTalPopupMenu *p) @@ -755,7 +756,7 @@ KviJoinChannelAction::KviJoinChannelAction(QObject * pParent) __tr2qs("Shows a popup menu that allows quickly selecting a channel to join"), KviActionManager::categoryIrc(), "kvi_bigicon_channelspopup.png", - QString("%1").arg(KVI_SMALLICON_CHANNEL), + QString("%1").arg(KviIconManager::Channel), NeedsConnection | NeedsContext) { } @@ -810,7 +811,7 @@ KviChangeNickAction::KviChangeNickAction(QObject * pParent) __tr2qs("Shows a popup menu that allows quickly changing the nickname"), KviActionManager::categoryIrc(), "kvi_bigicon_nickpopup.png", - QString("%1").arg(KVI_SMALLICON_NICK), + QString("%1").arg(KviIconManager::Nick), NeedsConnection | NeedsContext) { } @@ -862,7 +863,7 @@ KviConnectToServerAction::KviConnectToServerAction(QObject * pParent) __tr2qs("Shows a popup menu that allows quickly connecting to a server"), KviActionManager::categoryIrc(), "kvi_bigicon_server.png", - QString("%1").arg(KVI_SMALLICON_SERVER), + QString("%1").arg(KviIconManager::Server), NeedsContext) { } @@ -871,7 +872,7 @@ void KviConnectToServerAction::popupAboutToShow() { g_pApp->fillRecentServersPopup(m_pPopup); m_pPopup->insertSeparator(); - m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs("Other...")); + m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Server)),__tr2qs("Other...")); m_pPopup->insertSeparator(); m_pPopup->insertItem(__tr2qs("Clear Recent Servers List")); } @@ -911,7 +912,7 @@ KviChangeUserModeAction::KviChangeUserModeAction(QObject * pParent) __tr2qs("Shows a popup menu that allows quickly changing user modes"), KviActionManager::categoryIrc(), "kvi_bigicon_usermode.png", - QString("%1").arg(KVI_SMALLICON_MODE), + QString("%1").arg(KviIconManager::Mode), NeedsContext | NeedsConnection) { } @@ -925,11 +926,11 @@ void KviChangeUserModeAction::popupAboutToShow() int id; QString szModes = g_pActiveWindow->connection()->serverInfo()->supportedUserModes(); - id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WALLOPS)),__tr2qs("Wallops (+w)")); + id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::WallOps)),__tr2qs("Wallops (+w)")); m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode('w')); - id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVERNOTICE)),__tr2qs("Server Notices (+s)")); + id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::ServerNotice)),__tr2qs("Server Notices (+s)")); m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode('s')); - id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_INVISIBLE)),__tr2qs("Invisible (+i)")); + id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Invisible)),__tr2qs("Invisible (+i)")); m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode('i')); szModes.replace("w",""); @@ -939,7 +940,7 @@ void KviChangeUserModeAction::popupAboutToShow() { QChar ccc = szModes[0]; szModes.remove(0,1); - id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MODE)),QString("+%1 Mode").arg(ccc)); + id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Mode)),QString("+%1 Mode").arg(ccc)); m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode(ccc.toLatin1())); } } @@ -982,7 +983,7 @@ KviGoAwayAction::KviGoAwayAction(QObject * pParent) __tr2qs("Allows entering and leaving away state"), KviActionManager::categoryIrc(), "kvi_bigicon_nokeyboard.png", - QString("%1").arg(KVI_SMALLICON_NOTAWAY), + QString("%1").arg(KviIconManager::NotAway), KviKvsAction::NeedsContext | KviKvsAction::NeedsConnection, KVI_SHORTCUTS_AWAY ) @@ -1068,22 +1069,22 @@ bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p) { t = m_szBackString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),t,this,SLOT(activate())); + p->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Away)),t,this,SLOT(activate())); } else { t = m_szAwayString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,SLOT(activate())); + p->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::NotAway)),t,this,SLOT(activate())); } } else { t = m_szAwayString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,SLOT(activate())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::NotAway)),t,this,SLOT(activate())); p->setItemEnabled(id,false); } } else { t = m_szAwayString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,SLOT(activate())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::NotAway)),t,this,SLOT(activate())); p->setItemEnabled(id,false); } return true; @@ -1116,7 +1117,7 @@ KviIrcToolsAction::KviIrcToolsAction(QObject * pParent) __tr2qs("Shows a popup menu with some IRC Tools"), KviActionManager::categoryIrc(), "kvi_bigicon_tools.png", - QString("%1").arg(KVI_SMALLICON_NONE), + QString("%1").arg(KviIconManager::None), NeedsConnection | NeedsContext) { } @@ -1149,7 +1150,7 @@ KviIrcOperationsAction::KviIrcOperationsAction(QObject * pParent) __tr2qs("Shows a popup menu with some IRC Actions"), KviActionManager::categoryIrc(), "kvi_bigicon_actions.png", - QString("%1").arg(KVI_SMALLICON_NONE), + QString("%1").arg(KviIconManager::None), NeedsConnection | NeedsContext) { } diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp index d82350725..4d11d1598 100644 --- a/src/kvirc/kernel/KviIconManager.cpp +++ b/src/kvirc/kernel/KviIconManager.cpp @@ -47,7 +47,7 @@ extern QPixmap * g_pActivityMeterPixmap; KviIconManager * g_pIconManager = 0; -static const char * g_szIconNames[KVI_NUM_SMALL_ICONS]= +static const char * g_szIconNames[KviIconManager::IconCount] = { "none", // 0 "close", // 1 @@ -384,10 +384,11 @@ KviIconWidget::KviIconWidget(QWidget * par) void KviIconWidget::init() { setWindowTitle(__tr2qs("Icon Table")); - setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)))); + setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::IconManager)))); - int rows = KVI_NUM_SMALL_ICONS / 20; - if((rows * 20) < KVI_NUM_SMALL_ICONS)rows++; + int rows = KviIconManager::IconCount / 20; + if((rows * 20) < KviIconManager::IconCount) + rows++; QGridLayout * g = new QGridLayout(this); int i; for(i = 0;i < 20;i++) @@ -402,7 +403,7 @@ void KviIconWidget::init() QLabel * l = new QLabel(tmp.ptr(),this); g->addWidget(l,i + 1,0); } - for(i = 0;i < KVI_NUM_SMALL_ICONS;i++) + for(i = 0;i < KviIconManager::IconCount; i++) { KviCString tmp(KviCString::Format,"%d",i); QLabel * l = new QLabel(this); @@ -483,7 +484,8 @@ void KviCachedPixmap::updateLastAccessTime() KviIconManager::KviIconManager() { int i=0; - for(i=0;i<KVI_NUM_SMALL_ICONS;i++)m_smallIcons[i] = 0; + for(i=0; i < IconCount; i++) + m_smallIcons[i] = 0; initQResourceBackend(); //loadSmallIcons(); @@ -516,12 +518,14 @@ KviIconManager::~KviIconManager() if(m_pIconWidget)delete m_pIconWidget; int i; - for(i=0;i<KVI_NUM_SMALL_ICONS;i++) + for(i=0; i < KviIconManager::IconCount; i++) { - if(m_smallIcons[i])delete m_smallIcons[i]; + if(m_smallIcons[i]) + delete m_smallIcons[i]; } delete m_pCachedImages; - if(m_pIconNames)delete m_pIconNames; + if(m_pIconNames) + delete m_pIconNames; } void KviIconManager::initQResourceBackend() @@ -542,27 +546,357 @@ void KviIconManager::initQResourceBackend() } -QString KviIconManager::getSmallIconResourceName(int idx) +QString KviIconManager::getSmallIconResourceName(SmallIcon eIcon) { QString szName("smallicons:kcs_"); - szName.append(g_szIconNames[idx]); + szName.append(g_szIconNames[eIcon]); szName.append(".png"); return szName; } -const char * KviIconManager::getSmallIconName(int idx) +KviIconManager::SmallIcon KviIconManager::iconName(int iIcon) +{ + switch(iIcon) + { + case 1: return KviIconManager::Close; break; + case 2: return KviIconManager::Maximize; break; + case 3: return KviIconManager::Minimize; break; + case 4: return KviIconManager::Restore; break; + case 5: return KviIconManager::DefaultIcon; break; + case 6: return KviIconManager::Dock; break; + case 7: return KviIconManager::UnDock; break; + case 8: return KviIconManager::QuitApp; break; + case 9: return KviIconManager::Console; break; + case 10: return KviIconManager::Floppy; break; + case 11: return KviIconManager::ParserError; break; + case 12: return KviIconManager::ParserWarning; break; + case 13: return KviIconManager::Server; break; + case 14: return KviIconManager::World; break; + case 15: return KviIconManager::Proxy; break; + case 16: return KviIconManager::KVIrc; break; + case 17: return KviIconManager::Cut; break; + case 18: return KviIconManager::Copy; break; + case 19: return KviIconManager::Paste; break; + case 20: return KviIconManager::Options; break; + case 21: return KviIconManager::SocketMessage; break; + case 22: return KviIconManager::SocketWarning; break; + case 23: return KviIconManager::SocketError; break; + case 24: return KviIconManager::SystemError; break; + case 25: return KviIconManager::Raw; break; + case 26: return KviIconManager::SystemWarning; break; + case 27: return KviIconManager::SystemMessage; break; + case 28: return KviIconManager::UnHandled; break; + case 29: return KviIconManager::ServerInfo; break; + case 30: return KviIconManager::Motd; break; + case 31: return KviIconManager::Channel; break; + case 32: return KviIconManager::HideDoubleView; break; + case 33: return KviIconManager::ShowDoubleView; break; + case 34: return KviIconManager::Op; break; + case 35: return KviIconManager::Voice; break; + case 36: return KviIconManager::ServerPing; break; + case 37: return KviIconManager::ShowListView; break; + case 38: return KviIconManager::HideListView; break; + case 39: return KviIconManager::Join; break; + case 40: return KviIconManager::Part; break; + case 41: return KviIconManager::Unrecognized; break; + case 42: return KviIconManager::Topic; break; + case 43: return KviIconManager::Accept; break; + case 44: return KviIconManager::Discard; break; + case 45: return KviIconManager::OwnPrivMsg; break; + case 46: return KviIconManager::ChanPrivMsg; break; + case 47: return KviIconManager::Query; break; + case 48: return KviIconManager::QueryPrivMsg; break; + case 49: return KviIconManager::Help; break; + case 50: return KviIconManager::MdiHelp; break; + case 51: return KviIconManager::CtcpReply; break; + case 52: return KviIconManager::CtcpRequestReplied; break; + case 53: return KviIconManager::CtcpRequestIgnored; break; + case 54: return KviIconManager::CtcpRequestFlood; break; + case 55: return KviIconManager::CtcpRequestUnknown; break; + case 56: return KviIconManager::Action; break; + case 57: return KviIconManager::Avatar; break; + case 58: return KviIconManager::Quit; break; + case 59: return KviIconManager::Split; break; + case 60: return KviIconManager::QuitSplit; break; + case 61: return KviIconManager::Nick; break; + case 62: return KviIconManager::DeOp; break; + case 63: return KviIconManager::DeVoice; break; + case 64: return KviIconManager::Mode; break; + case 65: return KviIconManager::Key; break; + case 66: return KviIconManager::Limit; break; + case 67: return KviIconManager::Ban; break; + case 68: return KviIconManager::UnBan; break; + case 69: return KviIconManager::BanExcept; break; + case 70: return KviIconManager::BanUnExcept; break; + case 71: return KviIconManager::InviteExcept; break; + case 72: return KviIconManager::InviteUnExcept; break; + case 73: return KviIconManager::ChanMode; break; + case 74: return KviIconManager::ChanModeHide; break; + case 75: return KviIconManager::Who; break; + case 76: return KviIconManager::Editor; break; + case 77: return KviIconManager::DccRequest; break; + case 78: return KviIconManager::DccMsg; break; + case 79: return KviIconManager::DccError; break; + case 80: return KviIconManager::IconManager; break; + case 81: return KviIconManager::ScriptCenter; break; + case 82: return KviIconManager::Bomb; break; + case 83: return KviIconManager::Event; break; + case 84: return KviIconManager::EventNoHandlers; break; + case 85: return KviIconManager::Handler; break; + case 86: return KviIconManager::HandlerDisabled; break; + case 87: return KviIconManager::NickNameProblem; break; + case 88: return KviIconManager::WhoisUser; break; + case 89: return KviIconManager::WhoisChannels; break; + case 90: return KviIconManager::WhoisIdle; break; + case 91: return KviIconManager::WhoisServer; break; + case 92: return KviIconManager::WhoisOther; break; + case 93: return KviIconManager::Time; break; + case 94: return KviIconManager::NotifyOnLine; break; + case 95: return KviIconManager::NotifyOffLine; break; + case 96: return KviIconManager::Locked; break; + case 97: return KviIconManager::UnLocked; break; + case 98: return KviIconManager::LockedOff; break; + case 99: return KviIconManager::UnLockedOff; break; + case 100: return KviIconManager::OwnPrivMsgCrypted; break; + case 101: return KviIconManager::ChanPrivMsgCrypted; break; + case 102: return KviIconManager::QueryPrivMsgCrypted; break; + case 103: return KviIconManager::DccChatMsg; break; + case 104: return KviIconManager::DccChatMsgCrypted; break; + case 105: return KviIconManager::Irc; break; + case 106: return KviIconManager::Folder; break; + case 107: return KviIconManager::Home; break; + case 108: return KviIconManager::BookMarks; break; + case 109: return KviIconManager::Spy; break; + case 110: return KviIconManager::Kick; break; + case 111: return KviIconManager::Linux; break; + case 112: return KviIconManager::Links; break; + case 113: return KviIconManager::RegUsers; break; + case 114: return KviIconManager::TrayIcon; break; + case 115: return KviIconManager::CascadeWindows; break; + case 116: return KviIconManager::MaxVertical; break; + case 117: return KviIconManager::MaxHorizontal; break; + case 118: return KviIconManager::TileWindows; break; + case 119: return KviIconManager::Log; break; + case 120: return KviIconManager::Spam; break; + case 121: return KviIconManager::File; break; + case 122: return KviIconManager::Icq; break; + case 123: return KviIconManager::IcqYellow; break; + case 124: return KviIconManager::IcqRed; break; + case 125: return KviIconManager::IcqBlue; break; + case 126: return KviIconManager::IcqLightGreen; break; + case 127: return KviIconManager::IcqLightYellow; break; + case 128: return KviIconManager::Message; break; + case 129: return KviIconManager::MessageSent; break; + case 130: return KviIconManager::BlueSquare; break; + case 131: return KviIconManager::VioletSquare; break; + case 132: return KviIconManager::YellowSquare; break; + case 133: return KviIconManager::GreenSquare; break; + case 134: return KviIconManager::BlackSquare; break; + case 135: return KviIconManager::RedSquare; break; + case 136: return KviIconManager::CyanSquare; break; + case 137: return KviIconManager::DarkGreenSquare; break; + case 138: return KviIconManager::Terminal; break; + case 139: return KviIconManager::WallOps; break; + case 140: return KviIconManager::Invisible; break; + case 141: return KviIconManager::ServerNotice; break; + case 142: return KviIconManager::Gnutella; break; + case 143: return KviIconManager::Search; break; + case 144: return KviIconManager::Files; break; + case 145: return KviIconManager::Transfer; break; + case 146: return KviIconManager::Package; break; + case 147: return KviIconManager::Retry; break; + case 148: return KviIconManager::Idea; break; + case 149: return KviIconManager::Colors; break; + case 150: return KviIconManager::Gui; break; + case 151: return KviIconManager::IrcView; break; + case 152: return KviIconManager::Alias; break; + case 153: return KviIconManager::ChannelNotice; break; + case 154: return KviIconManager::ChannelNoticeCrypted; break; + case 155: return KviIconManager::QueryNotice; break; + case 156: return KviIconManager::QueryNoticeCrypted; break; + case 157: return KviIconManager::ServNotice; break; + case 158: return KviIconManager::Popup; break; + case 159: return KviIconManager::Prologue; break; + case 160: return KviIconManager::Epilogue; break; + case 161: return KviIconManager::SharedFiles; break; + case 162: return KviIconManager::CtcpReplyUnknown; break; + case 163: return KviIconManager::Canvas; break; + case 164: return KviIconManager::NickServ; break; + case 165: return KviIconManager::ChanServ; break; + case 166: return KviIconManager::DccVoice; break; + case 167: return KviIconManager::Play; break; + case 168: return KviIconManager::Record; break; + case 169: return KviIconManager::AutoTileWindows; break; + case 170: return KviIconManager::Away; break; + case 171: return KviIconManager::Ident; break; + case 172: return KviIconManager::HomePage; break; + case 173: return KviIconManager::List; break; + case 174: return KviIconManager::HalfOp; break; + case 175: return KviIconManager::HalfDeOp; break; + case 176: return KviIconManager::Invite; break; + case 177: return KviIconManager::MultiMedia; break; + case 178: return KviIconManager::Look; break; + case 179: return KviIconManager::Input; break; + case 180: return KviIconManager::Messages; break; + case 181: return KviIconManager::QueryTrace; break; + case 182: return KviIconManager::NoChannel; break; + case 183: return KviIconManager::BroadcastPrivMsg; break; + case 184: return KviIconManager::BroadcastNotice; break; + case 185: return KviIconManager::Url; break; + case 186: return KviIconManager::RawEvent; break; + case 187: return KviIconManager::RawEventNoHandlers; break; + case 188: return KviIconManager::MeKick; break; + case 189: return KviIconManager::MeOp; break; + case 190: return KviIconManager::MeVoice; break; + case 191: return KviIconManager::MeDeOp; break; + case 192: return KviIconManager::MeDeVoice; break; + case 193: return KviIconManager::MeHalfOp; break; + case 194: return KviIconManager::MeDeHalfOp; break; + case 195: return KviIconManager::MeBan; break; + case 196: return KviIconManager::MeUnBan; break; + case 197: return KviIconManager::MeBanExcept; break; + case 198: return KviIconManager::MeBanUnExcept; break; + case 199: return KviIconManager::MeInviteExcept; break; + case 200: return KviIconManager::MeInviteUnExcept; break; + case 201: return KviIconManager::ClassicWindowList; break; + case 202: return KviIconManager::TreeWindowList; break; + case 203: return KviIconManager::Ignore; break; + case 204: return KviIconManager::UserList; break; + case 205: return KviIconManager::Stats; break; + case 206: return KviIconManager::PopupMenu; break; + case 207: return KviIconManager::Xy; break; + case 208: return KviIconManager::Irc0; break; + case 209: return KviIconManager::Irc1; break; + case 210: return KviIconManager::Irc2; break; + case 211: return KviIconManager::Irc3; break; + case 212: return KviIconManager::Irc4; break; + case 213: return KviIconManager::Irc5; break; + case 214: return KviIconManager::Heart; break; + case 215: return KviIconManager::HeartBroken; break; + case 216: return KviIconManager::Rose; break; + case 217: return KviIconManager::BigGrin; break; + case 218: return KviIconManager::BigGrinGlasses; break; + case 219: return KviIconManager::BigGrinEyes; break; + case 220: return KviIconManager::TextExclamative; break; + case 221: return KviIconManager::TextPoints; break; + case 222: return KviIconManager::Kiss; break; + case 223: return KviIconManager::Surprised1; break; + case 224: return KviIconManager::Ugly; break; + case 225: return KviIconManager::Angry; break; + case 226: return KviIconManager::Surprised2; break; + case 227: return KviIconManager::Smile; break; + case 228: return KviIconManager::Tongue; break; + case 229: return KviIconManager::Ssl; break; + case 230: return KviIconManager::Cry; break; + case 231: return KviIconManager::Eye; break; + case 232: return KviIconManager::DeadChannel; break; + case 233: return KviIconManager::DeadQuery; break; + case 234: return KviIconManager::Sound; break; + case 235: return KviIconManager::ToolBar; break; + case 236: return KviIconManager::TextEncoding; break; + case 237: return KviIconManager::NewItem; break; + case 238: return KviIconManager::NewItemByWizard; break; + case 239: return KviIconManager::DeleteItem; break; + case 240: return KviIconManager::EditItem; break; + case 241: return KviIconManager::FileTransfer; break; + case 242: return KviIconManager::ChanAdmin; break; + case 243: return KviIconManager::ChanUnAdmin; break; + case 244: return KviIconManager::MeChanAdmin; break; + case 245: return KviIconManager::MeChanUnAdmin; break; + case 246: return KviIconManager::UserOp; break; + case 247: return KviIconManager::DeUserOp; break; + case 248: return KviIconManager::MeUserOp; break; + case 249: return KviIconManager::MeDeUserOp; break; + case 250: return KviIconManager::Applet; break; + case 251: return KviIconManager::Caption; break; + case 252: return KviIconManager::Transparent; break; + case 253: return KviIconManager::Alert; break; + case 254: return KviIconManager::UserWindow; break; + case 255: return KviIconManager::StatusBar; break; + case 256: return KviIconManager::NotAway; break; + case 257: return KviIconManager::Plus; break; + case 258: return KviIconManager::Minus; break; + case 259: return KviIconManager::BinaryText; break; + case 260: return KviIconManager::ChanOwner; break; + case 261: return KviIconManager::ChanUnOwner; break; + case 262: return KviIconManager::MeChanOwner; break; + case 263: return KviIconManager::MeChanUnOwner; break; + case 264: return KviIconManager::Afraid; break; + case 265: return KviIconManager::Tongue2; break; + case 266: return KviIconManager::SayIcon; break; + case 267: return KviIconManager::SayColors; break; + case 268: return KviIconManager::Finger; break; + case 269: return KviIconManager::ScriptAction; break; + case 270: return KviIconManager::TearSmile; break; + case 271: return KviIconManager::Shy; break; + case 272: return KviIconManager::ServerError; break; + case 273: return KviIconManager::Cafe; break; + case 274: return KviIconManager::Addons; break; + case 275: return KviIconManager::ChanOwnerAway; break; + case 276: return KviIconManager::OpAway; break; + case 277: return KviIconManager::VoiceAway; break; + case 278: return KviIconManager::ChanAdminAway; break; + case 279: return KviIconManager::UserOpAway; break; + case 280: return KviIconManager::HalfOpAway; break; + case 281: return KviIconManager::ClassEditor; break; + case 282: return KviIconManager::Demoralized; break; + case 283: return KviIconManager::Slurp; break; + case 284: return KviIconManager::NameSpace; break; + case 285: return KviIconManager::SaySmile; break; + case 286: return KviIconManager::SayKvs; break; + case 287: return KviIconManager::ThemeOptions; break; + case 288: return KviIconManager::Bug; break; + case 289: return KviIconManager::Refresh; break; + case 290: return KviIconManager::Theme; break; + case 291: return KviIconManager::ScreenShot; break; + case 292: return KviIconManager::Update; break; + case 293: return KviIconManager::NotUpdate; break; + case 294: return KviIconManager::FailUpdate; break; + case 295: return KviIconManager::UnreadText; break; + case 296: return KviIconManager::IrcOp; break; + case 297: return KviIconManager::IrcOpAway; break; + case 298: return KviIconManager::DeIrcOp; break; + case 299: return KviIconManager::MeIrcOp; break; + case 300: return KviIconManager::MeDeIrcOp; break; + case 301: return KviIconManager::Angel; break; + case 302: return KviIconManager::Clown; break; + case 303: return KviIconManager::Devil; break; + case 304: return KviIconManager::InLove; break; + case 305: return KviIconManager::Ninja; break; + case 306: return KviIconManager::Pirate; break; + case 307: return KviIconManager::Puke; break; + case 308: return KviIconManager::Rage; break; + case 309: return KviIconManager::Class; break; + case 310: return KviIconManager::ClassNotBuilt; break; + case 311: return KviIconManager::Function; break; + case 312: return KviIconManager::SexMale; break; + case 313: return KviIconManager::SexFemale; break; + case 314: return KviIconManager::SexBot; break; + case 315: return KviIconManager::SexIrcOp; break; + case 0: + case KviIconManager::IconCount: + default: return KviIconManager::None; break; + } +} + +const char * KviIconManager::getSmallIconName(SmallIcon eIcon) { - return g_szIconNames[idx]; + return g_szIconNames[eIcon]; } -int KviIconManager::getSmallIconIdFromName(const QString &szName) +const char * KviIconManager::getSmallIconName(int iIcon) +{ + return g_szIconNames[iIcon]; +} + +int KviIconManager::getSmallIconIdFromName(const QString & szName) { if(!m_pIconNames) { m_pIconNames = new KviPointerHashTable<QString,int>(257,false); m_pIconNames->setAutoDelete(true); - for(int i=0;i<KVI_NUM_SMALL_ICONS;i++) + for(int i=0; i< IconCount; i++) { int * pInt = new int; *pInt = i; @@ -570,7 +904,8 @@ int KviIconManager::getSmallIconIdFromName(const QString &szName) } } int * pInt = m_pIconNames->find(szName); - if(!pInt)return 0; + if(!pInt) + return 0; return *pInt; } @@ -730,7 +1065,7 @@ QPixmap * KviIconManager::getImage(const QString &id,bool bCanBeNumber,QString* { // was a number : this is not a filename if(idx >= 0) - return getSmallIcon(idx % KVI_NUM_SMALL_ICONS); + return getSmallIcon(idx % KviIconManager::IconCount); } else { if(id.startsWith("$icon")) { @@ -741,7 +1076,7 @@ QPixmap * KviIconManager::getImage(const QString &id,bool bCanBeNumber,QString* szTmp.replace("\"",""); idx = getSmallIconIdFromName(szTmp.trimmed()); if(idx >= 0) - return getSmallIcon(idx % KVI_NUM_SMALL_ICONS); + return getSmallIcon(idx % KviIconManager::IconCount); } } @@ -773,7 +1108,7 @@ QPixmap * KviIconManager::getBigIcon(const QString &szName) tmpName += ".scaled16to32"; p = getPixmap(tmpName); if(p)return p; - p = getSmallIcon(idx % KVI_NUM_SMALL_ICONS); + p = getSmallIcon(idx % KviIconManager::IconCount); if(p) { QImage tmpi = p->toImage(); @@ -888,18 +1223,19 @@ void KviIconManager::clearCache() void KviIconManager::reloadImages() { clearCache(); - for(int i=0;i<KVI_NUM_SMALL_ICONS;i++) + for(int i=0; i < KviIconManager::IconCount; i++) { if(m_smallIcons[i])delete m_smallIcons[i]; m_smallIcons[i] = 0; } } - QPixmap * KviIconManager::loadSmallIcon(int idx) { - if(idx >= KVI_NUM_SMALL_ICONS)return 0; - if(idx < 0)return 0; + if(idx >= KviIconManager::IconCount) + return 0; + if(idx < 0) + return 0; QString szPath; QString buffer; diff --git a/src/kvirc/kernel/KviIconManager.h b/src/kvirc/kernel/KviIconManager.h index 2d1b8f2dd..554a9b885 100644 --- a/src/kvirc/kernel/KviIconManager.h +++ b/src/kvirc/kernel/KviIconManager.h @@ -35,324 +35,6 @@ #include <QObject> #include <QWidget> -#define KVI_SMALLICON_NONE 0 -#define KVI_SMALLICON_CLOSE 1 -#define KVI_SMALLICON_MAXIMIZE 2 -#define KVI_SMALLICON_MINIMIZE 3 -#define KVI_SMALLICON_RESTORE 4 -#define KVI_SMALLICON_DEFAULTICON 5 -#define KVI_SMALLICON_DOCK 6 -#define KVI_SMALLICON_UNDOCK 7 -#define KVI_SMALLICON_QUITAPP 8 -#define KVI_SMALLICON_CONSOLE 9 -#define KVI_SMALLICON_FLOPPY 10 -#define KVI_SMALLICON_PARSERERROR 11 -#define KVI_SMALLICON_PARSERWARNING 12 -#define KVI_SMALLICON_SERVER 13 -#define KVI_SMALLICON_WORLD 14 -#define KVI_SMALLICON_PROXY 15 -#define KVI_SMALLICON_KVIRC 16 -#define KVI_SMALLICON_CUT 17 -#define KVI_SMALLICON_COPY 18 -#define KVI_SMALLICON_PASTE 19 -#define KVI_SMALLICON_OPTIONS 20 -#define KVI_SMALLICON_SOCKETMESSAGE 21 -#define KVI_SMALLICON_SOCKETWARNING 22 -#define KVI_SMALLICON_SOCKETERROR 23 -#define KVI_SMALLICON_SYSTEMERROR 24 -#define KVI_SMALLICON_RAW 25 -#define KVI_SMALLICON_SYSTEMWARNING 26 -#define KVI_SMALLICON_SYSTEMMESSAGE 27 -#define KVI_SMALLICON_UNHANDLED 28 -#define KVI_SMALLICON_SERVERINFO 29 -#define KVI_SMALLICON_MOTD 30 -#define KVI_SMALLICON_CHANNEL 31 -#define KVI_SMALLICON_HIDEDOUBLEVIEW 32 -#define KVI_SMALLICON_SHOWDOUBLEVIEW 33 -#define KVI_SMALLICON_OP 34 -#define KVI_SMALLICON_VOICE 35 -#define KVI_SMALLICON_SERVERPING 36 -#define KVI_SMALLICON_SHOWLISTVIEW 37 -#define KVI_SMALLICON_HIDELISTVIEW 38 -#define KVI_SMALLICON_JOIN 39 -#define KVI_SMALLICON_PART 40 -#define KVI_SMALLICON_UNRECOGNIZED 41 -#define KVI_SMALLICON_TOPIC 42 -#define KVI_SMALLICON_ACCEPT 43 -#define KVI_SMALLICON_DISCARD 44 -#define KVI_SMALLICON_OWNPRIVMSG 45 -#define KVI_SMALLICON_CHANPRIVMSG 46 -#define KVI_SMALLICON_QUERY 47 -#define KVI_SMALLICON_QUERYPRIVMSG 48 -#define KVI_SMALLICON_HELP 49 -#define KVI_SMALLICON_MDIHELP 50 -#define KVI_SMALLICON_CTCPREPLY 51 -#define KVI_SMALLICON_CTCPREQUESTREPLIED 52 -#define KVI_SMALLICON_CTCPREQUESTIGNORED 53 -#define KVI_SMALLICON_CTCPREQUESTFLOOD 54 -#define KVI_SMALLICON_CTCPREQUESTUNKNOWN 55 -#define KVI_SMALLICON_ACTION 56 -#define KVI_SMALLICON_AVATAR 57 -#define KVI_SMALLICON_QUIT 58 -#define KVI_SMALLICON_SPLIT 59 -#define KVI_SMALLICON_QUITSPLIT 60 -#define KVI_SMALLICON_NICK 61 -#define KVI_SMALLICON_DEOP 62 -#define KVI_SMALLICON_DEVOICE 63 -#define KVI_SMALLICON_MODE 64 -#define KVI_SMALLICON_KEY 65 -#define KVI_SMALLICON_LIMIT 66 -#define KVI_SMALLICON_BAN 67 -#define KVI_SMALLICON_UNBAN 68 -#define KVI_SMALLICON_BANEXCEPT 69 -#define KVI_SMALLICON_BANUNEXCEPT 70 -#define KVI_SMALLICON_INVITEEXCEPT 71 -#define KVI_SMALLICON_INVITEUNEXCEPT 72 -#define KVI_SMALLICON_CHANMODE 73 -#define KVI_SMALLICON_CHANMODEHIDE 74 -#define KVI_SMALLICON_WHO 75 -#define KVI_SMALLICON_EDITOR 76 -#define KVI_SMALLICON_DCCREQUEST 77 -#define KVI_SMALLICON_DCCMSG 78 -#define KVI_SMALLICON_DCCERROR 79 -#define KVI_SMALLICON_ICONMANAGER 80 -#define KVI_SMALLICON_SCRIPTCENTER 81 -#define KVI_SMALLICON_BOMB 82 -#define KVI_SMALLICON_EVENT 83 -#define KVI_SMALLICON_EVENTNOHANDLERS 84 -#define KVI_SMALLICON_HANDLER 85 -#define KVI_SMALLICON_HANDLERDISABLED 86 -#define KVI_SMALLICON_NICKNAMEPROBLEM 87 -#define KVI_SMALLICON_WHOISUSER 88 -#define KVI_SMALLICON_WHOISCHANNELS 89 -#define KVI_SMALLICON_WHOISIDLE 90 -#define KVI_SMALLICON_WHOISSERVER 91 -#define KVI_SMALLICON_WHOISOTHER 92 -#define KVI_SMALLICON_TIME 93 -#define KVI_SMALLICON_NOTIFYONLINE 94 -#define KVI_SMALLICON_NOTIFYOFFLINE 95 -#define KVI_SMALLICON_LOCKED 96 -#define KVI_SMALLICON_UNLOCKED 97 -#define KVI_SMALLICON_LOCKEDOFF 98 -#define KVI_SMALLICON_UNLOCKEDOFF 99 -#define KVI_SMALLICON_OWNPRIVMSGCRYPTED 100 -#define KVI_SMALLICON_CHANPRIVMSGCRYPTED 101 -#define KVI_SMALLICON_QUERYPRIVMSGCRYPTED 102 -#define KVI_SMALLICON_DCCCHATMSG 103 -#define KVI_SMALLICON_DCCCHATMSGCRYPTED 104 -#define KVI_SMALLICON_IRC 105 -#define KVI_SMALLICON_FOLDER 106 -#define KVI_SMALLICON_HOME 107 -#define KVI_SMALLICON_BOOKMARKS 108 -#define KVI_SMALLICON_SPY 109 -#define KVI_SMALLICON_KICK 110 -#define KVI_SMALLICON_LINUX 111 -#define KVI_SMALLICON_LINKS 112 -#define KVI_SMALLICON_REGUSERS 113 -#define KVI_SMALLICON_TRAYICON 114 -#define KVI_SMALLICON_CASCADEWINDOWS 115 -#define KVI_SMALLICON_MAXVERTICAL 116 -#define KVI_SMALLICON_MAXHORIZONTAL 117 -#define KVI_SMALLICON_TILEWINDOWS 118 -#define KVI_SMALLICON_LOG 119 -#define KVI_SMALLICON_SPAM 120 -#define KVI_SMALLICON_FILE 121 -#define KVI_SMALLICON_ICQ 122 -#define KVI_SMALLICON_ICQYELLOW 123 -#define KVI_SMALLICON_ICQRED 124 -#define KVI_SMALLICON_ICQBLUE 125 -#define KVI_SMALLICON_ICQLIGHTGREEN 126 -#define KVI_SMALLICON_ICQLIGHTYELLOW 127 -#define KVI_SMALLICON_MESSAGE 128 -#define KVI_SMALLICON_MESSAGESENT 129 -#define KVI_SMALLICON_BLUESQUARE 130 -#define KVI_SMALLICON_VIOLETSQUARE 131 -#define KVI_SMALLICON_YELLOWSQUARE 132 -#define KVI_SMALLICON_GREENSQUARE 133 -#define KVI_SMALLICON_BLACKSQUARE 134 -#define KVI_SMALLICON_REDSQUARE 135 -#define KVI_SMALLICON_CYANSQUARE 136 -#define KVI_SMALLICON_DKGREENSQUARE 137 -#define KVI_SMALLICON_TERMINAL 138 -#define KVI_SMALLICON_WALLOPS 139 -#define KVI_SMALLICON_INVISIBLE 140 -#define KVI_SMALLICON_SERVERNOTICE 141 -#define KVI_SMALLICON_GNUTELLA 142 -#define KVI_SMALLICON_SEARCH 143 -#define KVI_SMALLICON_FILES 144 -#define KVI_SMALLICON_TRANSFER 145 -#define KVI_SMALLICON_PACKAGE 146 -#define KVI_SMALLICON_RETRY 147 -#define KVI_SMALLICON_IDEA 148 -#define KVI_SMALLICON_COLORS 149 -#define KVI_SMALLICON_GUI 150 -#define KVI_SMALLICON_IRCVIEW 151 -#define KVI_SMALLICON_ALIAS 152 -#define KVI_SMALLICON_CHANNELNOTICE 153 -#define KVI_SMALLICON_CHANNELNOTICECRYPTED 154 -#define KVI_SMALLICON_QUERYNOTICE 155 -#define KVI_SMALLICON_QUERYNOTICECRYPTED 156 -#define KVI_SMALLICON_SERVNOTICE 157 -#define KVI_SMALLICON_POPUP 158 -#define KVI_SMALLICON_PROLOGUE 159 -#define KVI_SMALLICON_EPILOGUE 160 -#define KVI_SMALLICON_SHAREDFILES 161 -#define KVI_SMALLICON_CTCPREPLYUNKNOWN 162 -#define KVI_SMALLICON_CANVAS 163 -#define KVI_SMALLICON_NICKSERV 164 -#define KVI_SMALLICON_CHANSERV 165 -#define KVI_SMALLICON_DCCVOICE 166 -#define KVI_SMALLICON_PLAY 167 -#define KVI_SMALLICON_RECORD 168 -#define KVI_SMALLICON_AUTOTILEWINDOWS 169 -#define KVI_SMALLICON_AWAY 170 -#define KVI_SMALLICON_IDENT 171 -#define KVI_SMALLICON_HOMEPAGE 172 -#define KVI_SMALLICON_LIST 173 -#define KVI_SMALLICON_HALFOP 174 -#define KVI_SMALLICON_HALFDEOP 175 -#define KVI_SMALLICON_INVITE 176 -#define KVI_SMALLICON_MULTIMEDIA 177 -#define KVI_SMALLICON_LOOK 178 -#define KVI_SMALLICON_INPUT 179 -#define KVI_SMALLICON_MESSAGES 180 -#define KVI_SMALLICON_QUERYTRACE 181 -#define KVI_SMALLICON_NOCHANNEL 182 -#define KVI_SMALLICON_BROADCASTPRIVMSG 183 -#define KVI_SMALLICON_BROADCASTNOTICE 184 -#define KVI_SMALLICON_URL 185 -#define KVI_SMALLICON_RAWEVENT 186 -#define KVI_SMALLICON_RAWEVENTNOHANDLERS 187 -#define KVI_SMALLICON_MEKICK 188 -#define KVI_SMALLICON_MEOP 189 -#define KVI_SMALLICON_MEVOICE 190 -#define KVI_SMALLICON_MEDEOP 191 -#define KVI_SMALLICON_MEDEVOICE 192 -#define KVI_SMALLICON_MEHALFOP 193 -#define KVI_SMALLICON_MEDEHALFOP 194 -#define KVI_SMALLICON_MEBAN 195 -#define KVI_SMALLICON_MEUNBAN 196 -#define KVI_SMALLICON_MEBANEXCEPT 197 -#define KVI_SMALLICON_MEBANUNEXCEPT 198 -#define KVI_SMALLICON_MEINVITEEXCEPT 199 -#define KVI_SMALLICON_MEINVITEUNEXCEPT 200 -#define KVI_SMALLICON_CLASSICWINDOWLIST 201 -#define KVI_SMALLICON_TREEWINDOWLIST 202 -#define KVI_SMALLICON_IGNORE 203 -#define KVI_SMALLICON_USERLIST 204 -#define KVI_SMALLICON_STATS 205 -#define KVI_SMALLICON_POPUPMENU 206 -#define KVI_SMALLICON_XY 207 -#define KVI_SMALLICON_IRC0 208 -#define KVI_SMALLICON_IRC1 209 -#define KVI_SMALLICON_IRC2 210 -#define KVI_SMALLICON_IRC3 211 -#define KVI_SMALLICON_IRC4 212 -#define KVI_SMALLICON_IRC5 213 -#define KVI_SMALLICON_HEART 214 -#define KVI_SMALLICON_HEARTBROKEN 215 -#define KVI_SMALLICON_ROSE 216 -#define KVI_SMALLICON_BIGGRIN 217 -#define KVI_SMALLICON_BIGGRINGLASSES 218 -#define KVI_SMALLICON_BIGGRINEYES 219 -#define KVI_SMALLICON_TEXTEXCLAMATIVE 220 -#define KVI_SMALLICON_TEXTPOINTS 221 -#define KVI_SMALLICON_KISS 222 -#define KVI_SMALLICON_SURPRISED1 223 -#define KVI_SMALLICON_UGLY 224 -#define KVI_SMALLICON_ANGRY 225 -#define KVI_SMALLICON_SURPRISED2 226 -#define KVI_SMALLICON_SMILE 227 -#define KVI_SMALLICON_TONGUE 228 -#define KVI_SMALLICON_SSL 229 -#define KVI_SMALLICON_CRY 230 -#define KVI_SMALLICON_EYE 231 -#define KVI_SMALLICON_DEADCHANNEL 232 -#define KVI_SMALLICON_DEADQUERY 233 -#define KVI_SMALLICON_SOUND 234 -#define KVI_SMALLICON_TOOLBAR 235 -#define KVI_SMALLICON_TEXTENCODING 236 -#define KVI_SMALLICON_NEWITEM 237 -#define KVI_SMALLICON_NEWITEMBYWIZARD 238 -#define KVI_SMALLICON_DELETEITEM 239 -#define KVI_SMALLICON_EDITITEM 240 -#define KVI_SMALLICON_FILETRANSFER 241 -#define KVI_SMALLICON_CHANADMIN 242 -#define KVI_SMALLICON_CHANUNADMIN 243 -#define KVI_SMALLICON_MECHANADMIN 244 -#define KVI_SMALLICON_MECHANUNADMIN 245 -#define KVI_SMALLICON_USEROP 246 -#define KVI_SMALLICON_DEUSEROP 247 -#define KVI_SMALLICON_MEUSEROP 248 -#define KVI_SMALLICON_MEDEUSEROP 249 -#define KVI_SMALLICON_APPLET 250 -#define KVI_SMALLICON_CAPTION 251 -#define KVI_SMALLICON_TRANSPARENT 252 -#define KVI_SMALLICON_ALERT 253 -#define KVI_SMALLICON_USERWINDOW 254 -#define KVI_SMALLICON_STATUSBAR 255 -#define KVI_SMALLICON_NOTAWAY 256 -#define KVI_SMALLICON_PLUS 257 -#define KVI_SMALLICON_MINUS 258 -#define KVI_SMALLICON_BINARYTEXT 259 -#define KVI_SMALLICON_CHANOWNER 260 -#define KVI_SMALLICON_CHANUNOWNER 261 -#define KVI_SMALLICON_MECHANOWNER 262 -#define KVI_SMALLICON_MECHANUNOWNER 263 -#define KVI_SMALLICON_AFRAID 264 -#define KVI_SMALLICON_TONGUE2 265 -#define KVI_SMALLICON_SAYICON 266 -#define KVI_SMALLICON_SAYCOLORS 267 -#define KVI_SMALLICON_FINGER 268 -#define KVI_SMALLICON_SCRIPTACTION 269 -#define KVI_SMALLICON_TEARSMILE 270 -#define KVI_SMALLICON_SHY 271 -#define KVI_SMALLICON_SERVERERROR 272 -#define KVI_SMALLICON_CAFE 273 -#define KVI_SMALLICON_ADDONS 274 -#define KVI_SMALLICON_CHANOWNERAWAY 275 -#define KVI_SMALLICON_OPAWAY 276 -#define KVI_SMALLICON_VOICEAWAY 277 -#define KVI_SMALLICON_CHANADMINAWAY 278 -#define KVI_SMALLICON_USEROPAWAY 279 -#define KVI_SMALLICON_HALFOPAWAY 280 -#define KVI_SMALLICON_CLASSEDITOR 281 -#define KVI_SMALLICON_DEMORALIZED 282 -#define KVI_SMALLICON_SLURP 283 -#define KVI_SMALLICON_NAMESPACE 284 -#define KVI_SMALLICON_SAYSMILE 285 -#define KVI_SMALLICON_SAYKVS 286 -#define KVI_SMALLICON_THEMEOPTIONS 287 -#define KVI_SMALLICON_BUG 288 -#define KVI_SMALLICON_REFRESH 289 -#define KVI_SMALLICON_THEME 290 -#define KVI_SMALLICON_SCREENSHOT 291 -#define KVI_SMALLICON_UPDATE 292 -#define KVI_SMALLICON_NOTUPDATE 293 -#define KVI_SMALLICON_FAILUPDATE 294 -#define KVI_SMALLICON_UNREADTEXT 295 -#define KVI_SMALLICON_IRCOP 296 -#define KVI_SMALLICON_IRCOPAWAY 297 -#define KVI_SMALLICON_DEIRCOP 298 -#define KVI_SMALLICON_MEIRCOP 299 -#define KVI_SMALLICON_MEDEIRCOP 300 -#define KVI_SMALLICON_ANGEL 301 -#define KVI_SMALLICON_CLOWN 302 -#define KVI_SMALLICON_DEVIL 303 -#define KVI_SMALLICON_INLOVE 304 -#define KVI_SMALLICON_NINJA 305 -#define KVI_SMALLICON_PIRATE 306 -#define KVI_SMALLICON_PUKE 307 -#define KVI_SMALLICON_RAGE 308 -#define KVI_SMALLICON_CLASS 309 -#define KVI_SMALLICON_CLASSNOTBUILT 310 -#define KVI_SMALLICON_FUNCTION 311 -#define KVI_SMALLICON_SEXMALE 312 -#define KVI_SMALLICON_SEXFEMALE 313 -#define KVI_SMALLICON_SEXBOT 314 -#define KVI_SMALLICON_SEXIRCOP 315 - -#define KVI_NUM_SMALL_ICONS 316 #define KVI_BIGICON_DISCONNECTED "kvi_bigicon_disconnected.png" @@ -456,55 +138,386 @@ class KVIRC_API KviIconManager : public QObject { Q_OBJECT public: + /** + * \enum SmallIcon + * \brief Contains all KVIrc's small icons + */ + enum SmallIcon { + None = 0, + Close = 1, + Maximize = 2, + Minimize = 3, + Restore = 4, + DefaultIcon = 5, + Dock = 6, + UnDock = 7, + QuitApp = 8, + Console = 9, + Floppy = 10, + ParserError = 11, + ParserWarning = 12, + Server = 13, + World = 14, + Proxy = 15, + KVIrc = 16, + Cut = 17, + Copy = 18, + Paste = 19, + Options = 20, + SocketMessage = 21, + SocketWarning = 22, + SocketError = 23, + SystemError = 24, + Raw = 25, + SystemWarning = 26, + SystemMessage = 27, + UnHandled = 28, + ServerInfo = 29, + Motd = 30, + Channel = 31, + HideDoubleView = 32, + ShowDoubleView = 33, + Op = 34, + Voice = 35, + ServerPing = 36, + ShowListView = 37, + HideListView = 38, + Join = 39, + Part = 40, + Unrecognized = 41, + Topic = 42, + Accept = 43, + Discard = 44, + OwnPrivMsg = 45, + ChanPrivMsg = 46, + Query = 47, + QueryPrivMsg = 48, + Help = 49, + MdiHelp = 50, + CtcpReply = 51, + CtcpRequestReplied = 52, + CtcpRequestIgnored = 53, + CtcpRequestFlood = 54, + CtcpRequestUnknown = 55, + Action = 56, + Avatar = 57, + Quit = 58, + Split = 59, + QuitSplit = 60, + Nick = 61, + DeOp = 62, + DeVoice = 63, + Mode = 64, + Key = 65, + Limit = 66, + Ban = 67, + UnBan = 68, + BanExcept = 69, + BanUnExcept = 70, + InviteExcept = 71, + InviteUnExcept = 72, + ChanMode = 73, + ChanModeHide = 74, + Who = 75, + Editor = 76, + DccRequest = 77, + DccMsg = 78, + DccError = 79, + IconManager = 80, + ScriptCenter = 81, + Bomb = 82, + Event = 83, + EventNoHandlers = 84, + Handler = 85, + HandlerDisabled = 86, + NickNameProblem = 87, + WhoisUser = 88, + WhoisChannels = 89, + WhoisIdle = 90, + WhoisServer = 91, + WhoisOther = 92, + Time = 93, + NotifyOnLine = 94, + NotifyOffLine = 95, + Locked = 96, + UnLocked = 97, + LockedOff = 98, + UnLockedOff = 99, + OwnPrivMsgCrypted = 100, + ChanPrivMsgCrypted = 101, + QueryPrivMsgCrypted = 102, + DccChatMsg = 103, + DccChatMsgCrypted = 104, + Irc = 105, + Folder = 106, + Home = 107, + BookMarks = 108, + Spy = 109, + Kick = 110, + Linux = 111, + Links = 112, + RegUsers = 113, + TrayIcon = 114, + CascadeWindows = 115, + MaxVertical = 116, + MaxHorizontal = 117, + TileWindows = 118, + Log = 119, + Spam = 120, + File = 121, + Icq = 122, + IcqYellow = 123, + IcqRed = 124, + IcqBlue = 125, + IcqLightGreen = 126, + IcqLightYellow = 127, + Message = 128, + MessageSent = 129, + BlueSquare = 130, + VioletSquare = 131, + YellowSquare = 132, + GreenSquare = 133, + BlackSquare = 134, + RedSquare = 135, + CyanSquare = 136, + DarkGreenSquare = 137, + Terminal = 138, + WallOps = 139, + Invisible = 140, + ServerNotice = 141, + Gnutella = 142, + Search = 143, + Files = 144, + Transfer = 145, + Package = 146, + Retry = 147, + Idea = 148, + Colors = 149, + Gui = 150, + IrcView = 151, + Alias = 152, + ChannelNotice = 153, + ChannelNoticeCrypted = 154, + QueryNotice = 155, + QueryNoticeCrypted = 156, + ServNotice = 157, + Popup = 158, + Prologue = 159, + Epilogue = 160, + SharedFiles = 161, + CtcpReplyUnknown = 162, + Canvas = 163, + NickServ = 164, + ChanServ = 165, + DccVoice = 166, + Play = 167, + Record = 168, + AutoTileWindows = 169, + Away = 170, + Ident = 171, + HomePage = 172, + List = 173, + HalfOp = 174, + HalfDeOp = 175, + Invite = 176, + MultiMedia = 177, + Look = 178, + Input = 179, + Messages = 180, + QueryTrace = 181, + NoChannel = 182, + BroadcastPrivMsg = 183, + BroadcastNotice = 184, + Url = 185, + RawEvent = 186, + RawEventNoHandlers = 187, + MeKick = 188, + MeOp = 189, + MeVoice = 190, + MeDeOp = 191, + MeDeVoice = 192, + MeHalfOp = 193, + MeDeHalfOp = 194, + MeBan = 195, + MeUnBan = 196, + MeBanExcept = 197, + MeBanUnExcept = 198, + MeInviteExcept = 199, + MeInviteUnExcept = 200, + ClassicWindowList = 201, + TreeWindowList = 202, + Ignore = 203, + UserList = 204, + Stats = 205, + PopupMenu = 206, + Xy = 207, + Irc0 = 208, + Irc1 = 209, + Irc2 = 210, + Irc3 = 211, + Irc4 = 212, + Irc5 = 213, + Heart = 214, + HeartBroken = 215, + Rose = 216, + BigGrin = 217, + BigGrinGlasses = 218, + BigGrinEyes = 219, + TextExclamative = 220, + TextPoints = 221, + Kiss = 222, + Surprised1 = 223, + Ugly = 224, + Angry = 225, + Surprised2 = 226, + Smile = 227, + Tongue = 228, + Ssl = 229, + Cry = 230, + Eye = 231, + DeadChannel = 232, + DeadQuery = 233, + Sound = 234, + ToolBar = 235, + TextEncoding = 236, + NewItem = 237, + NewItemByWizard = 238, + DeleteItem = 239, + EditItem = 240, + FileTransfer = 241, + ChanAdmin = 242, + ChanUnAdmin = 243, + MeChanAdmin = 244, + MeChanUnAdmin = 245, + UserOp = 246, + DeUserOp = 247, + MeUserOp = 248, + MeDeUserOp = 249, + Applet = 250, + Caption = 251, + Transparent = 252, + Alert = 253, + UserWindow = 254, + StatusBar = 255, + NotAway = 256, + Plus = 257, + Minus = 258, + BinaryText = 259, + ChanOwner = 260, + ChanUnOwner = 261, + MeChanOwner = 262, + MeChanUnOwner = 263, + Afraid = 264, + Tongue2 = 265, + SayIcon = 266, + SayColors = 267, + Finger = 268, + ScriptAction = 269, + TearSmile = 270, + Shy = 271, + ServerError = 272, + Cafe = 273, + Addons = 274, + ChanOwnerAway = 275, + OpAway = 276, + VoiceAway = 277, + ChanAdminAway = 278, + UserOpAway = 279, + HalfOpAway = 280, + ClassEditor = 281, + Demoralized = 282, + Slurp = 283, + NameSpace = 284, + SaySmile = 285, + SayKvs = 286, + ThemeOptions = 287, + Bug = 288, + Refresh = 289, + Theme = 290, + ScreenShot = 291, + Update = 292, + NotUpdate = 293, + FailUpdate = 294, + UnreadText = 295, + IrcOp = 296, + IrcOpAway = 297, + DeIrcOp = 298, + MeIrcOp = 299, + MeDeIrcOp = 300, + Angel = 301, + Clown = 302, + Devil = 303, + InLove = 304, + Ninja = 305, + Pirate = 306, + Puke = 307, + Rage = 308, + Class = 309, + ClassNotBuilt = 310, + Function = 311, + SexMale = 312, + SexFemale = 313, + SexBot = 314, + SexIrcOp = 315, + IconCount = 316 + }; + KviIconManager(); ~KviIconManager(); private: - QPixmap * m_smallIcons[KVI_NUM_SMALL_ICONS]; - KviIconWidget * m_pIconWidget; - - KviPointerHashTable<QString,KviCachedPixmap> * m_pCachedImages; - KviPointerHashTable<QString,int> * m_pIconNames; - unsigned int m_uCacheTotalSize; - unsigned int m_uCacheMaxSize; + QPixmap * m_smallIcons[IconCount]; + KviIconWidget * m_pIconWidget; + KviPointerHashTable<QString,KviCachedPixmap> * m_pCachedImages; + KviPointerHashTable<QString,int> * m_pIconNames; + unsigned int m_uCacheTotalSize; + unsigned int m_uCacheMaxSize; public: // WARNING: Don't store this pointer! // id == filename | number that indicates an internal pixmap // 0 stands for "any" - QPixmap * getImage(const QString &id,bool bCanBeNumber = true,QString* pRetPath = 0); + QPixmap * getImage(const QString & szId, bool bCanBeNumber = true, QString * pRetPath = 0); // The returned pointer is owned by the icon manager // and can be deleted at any time : so don't store it - KviCachedPixmap * getPixmapWithCache(const QString &szName); + KviCachedPixmap * getPixmapWithCache(const QString & szName); // The returned pointer is owned by the icon manager // and can be deleted at any time : so don't store it - KviCachedPixmap * getPixmapWithCacheScaleOnLoad(const QString &szName,int iMaxWidth,int iMaxHeight); + KviCachedPixmap * getPixmapWithCacheScaleOnLoad(const QString & szName, int iMaxWidth, int iMaxHeight); // The returned pointer is owned by the icon manager // and can be deleted at any time : so don't store it - QPixmap * getPixmap(const QString &szName) - { KviCachedPixmap * p = getPixmapWithCache(szName); return p ? p->pixmap() : 0; }; + QPixmap * getPixmap(const QString & szName) + { KviCachedPixmap * pPix = getPixmapWithCache(szName); return pPix ? pPix->pixmap() : 0; }; // this one never fails... if the image can't be found // a default 32x32 image is returned - QPixmap * getBigIcon(const QString &szName); + QPixmap * getBigIcon(const QString & szName); // this one never fails... if the icon isn't there // then a default 16x16 image is returned - QPixmap * getSmallIcon(int idx){ return idx < KVI_NUM_SMALL_ICONS ? (m_smallIcons[idx] ? m_smallIcons[idx] : loadSmallIcon(idx) ) : 0; }; + QPixmap * getSmallIcon(SmallIcon eIcon){ return eIcon < IconCount ? (m_smallIcons[eIcon] ? m_smallIcons[eIcon] : loadSmallIcon(eIcon) ) : 0; }; + + // provided for convenience + QPixmap * getSmallIcon(int iIcon){ return iIcon < IconCount ? (m_smallIcons[iIcon] ? m_smallIcons[iIcon] : loadSmallIcon(iIcon)) : 0; }; + + KviIconManager::SmallIcon iconName(int iIcon); + + const char * getSmallIconName(SmallIcon eIcon); - const char * getSmallIconName(int idx); + // provided for convenience + const char * getSmallIconName(int iIcon); - QString getSmallIconResourceName(int idx); + QString getSmallIconResourceName(SmallIcon eIcon); - int getSmallIconIdFromName(const QString &szName); + int getSmallIconIdFromName(const QString & szName); // if szLocalPath is empty then szName can be the identification // string for the avatar // if szName is empty then it is found from szLocalPath - KviAvatar * getAvatar(const QString &szLocalPath,const QString &szName); + KviAvatar * getAvatar(const QString & szLocalPath, const QString & szName); - void urlToCachedFileName(QString &szFName); + void urlToCachedFileName(QString & szFName); void clearCache(); void reloadImages(); @@ -512,9 +525,9 @@ public: void cacheCleanup(); protected: - void addToCache(const QString &szName,KviCachedPixmap * p); + void addToCache(const QString & szName, KviCachedPixmap * pPix); //void loadSmallIcons(); - QPixmap * loadSmallIcon(int idx); + QPixmap * loadSmallIcon(int iIdx); void initQResourceBackend(); public slots: diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp index 63c2a3aba..52e2278cb 100644 --- a/src/kvirc/kernel/KviOptions.cpp +++ b/src/kvirc/kernel/KviOptions.cpp @@ -723,153 +723,153 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]= KviMessageTypeSettingsOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]= { - MSGTYPE_OPTION("Echo",__tr_no_lookup("Normal text"),KVI_SMALLICON_NONE,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION_SPEC("Selection",__tr_no_lookup("Selection"),KVI_SMALLICON_NONE,KviMircCntrl::White,KviMircCntrl::Black,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION_SPEC("Highlight",__tr_no_lookup("Highlighted text"),KVI_SMALLICON_ALERT,KviMircCntrl::White,KviMircCntrl::Black,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION_SPEC("Url",__tr_no_lookup("URL foreground"),KVI_SMALLICON_NONE,KviMircCntrl::Blue,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION_SPEC("Link",__tr_no_lookup("Link overlay foreground"),KVI_SMALLICON_NONE,KviMircCntrl::Blue,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION_SPEC("ParserError",__tr_no_lookup("Parser error"),KVI_SMALLICON_PARSERERROR,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION_SPEC("ParserWarning",__tr_no_lookup("Parser warning"),KVI_SMALLICON_PARSERWARNING,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("HostLookup",__tr_no_lookup("Host lookup result"),KVI_SMALLICON_SERVER,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("SocketMessage",__tr_no_lookup("Socket message"),KVI_SMALLICON_SOCKETMESSAGE,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("SocketWarning",__tr_no_lookup("Socket warning"),KVI_SMALLICON_SOCKETWARNING,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION_SPEC("SocketError",__tr_no_lookup("Socket error"),KVI_SMALLICON_SOCKETERROR,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION_SPEC("SystemError",__tr_no_lookup("System error"),KVI_SMALLICON_SYSTEMERROR,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("Raw",__tr_no_lookup("Raw data to server"),KVI_SMALLICON_RAW,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Connection",__tr_no_lookup("Connection status"),KVI_SMALLICON_WORLD,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("SystemWarning",__tr_no_lookup("System warning"),KVI_SMALLICON_SYSTEMWARNING,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("SystemMessage",__tr_no_lookup("System message"),KVI_SMALLICON_SYSTEMMESSAGE,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("UnhandledReply",__tr_no_lookup("Unhandled server reply"),KVI_SMALLICON_UNHANDLED,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("ServerInfo",__tr_no_lookup("Server information"),KVI_SMALLICON_SERVERINFO,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Motd",__tr_no_lookup("Server Message of the Day"),KVI_SMALLICON_MOTD,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("ServerPing",__tr_no_lookup("Server ping"),KVI_SMALLICON_SERVERPING,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Join",__tr_no_lookup("Join message"),KVI_SMALLICON_JOIN,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Part",__tr_no_lookup("Part message"),KVI_SMALLICON_PART,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Unrecognized",__tr_no_lookup("Unrecognized/broken message"),KVI_SMALLICON_UNRECOGNIZED,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Topic",__tr_no_lookup("Topic message"),KVI_SMALLICON_TOPIC,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("OwnPrivateMessage",__tr_no_lookup("Own private message"),KVI_SMALLICON_OWNPRIVMSG,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("ChannelPrivateMessage",__tr_no_lookup("Channel private message"),KVI_SMALLICON_CHANPRIVMSG,KVI_MSGTYPE_LEVEL_4), - MSGTYPE_OPTION("QueryPrivateMessage",__tr_no_lookup("Query private message"),KVI_SMALLICON_QUERYPRIVMSG,KVI_MSGTYPE_LEVEL_4), - MSGTYPE_OPTION("CtcpReply",__tr_no_lookup("CTCP reply"),KVI_SMALLICON_CTCPREPLY,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("CtcpRequestReplied",__tr_no_lookup("CTCP request replied"),KVI_SMALLICON_CTCPREQUESTREPLIED,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("CtcpRequestIgnored",__tr_no_lookup("CTCP request ignored"),KVI_SMALLICON_CTCPREQUESTIGNORED,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("CtcpRequestFlood",__tr_no_lookup("CTCP request flood warning"),KVI_SMALLICON_CTCPREQUESTFLOOD,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("CtcpRequestUnknown",__tr_no_lookup("CTCP request unknown"),KVI_SMALLICON_CTCPREQUESTUNKNOWN,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("Action",__tr_no_lookup("User action"),KVI_SMALLICON_ACTION,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("AvatarChange",__tr_no_lookup("Avatar change"),KVI_SMALLICON_AVATAR,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("Quit",__tr_no_lookup("Quit message"),KVI_SMALLICON_QUIT,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Split",__tr_no_lookup("Split message"),KVI_SMALLICON_SPLIT,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("QuitSplit",__tr_no_lookup("Quit on netsplit message"),KVI_SMALLICON_QUITSPLIT,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Nick",__tr_no_lookup("Nick changes"),KVI_SMALLICON_NICK,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Op",__tr_no_lookup("+o mode change"),KVI_SMALLICON_OP,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Deop",__tr_no_lookup("-o mode change"),KVI_SMALLICON_DEOP,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Voice",__tr_no_lookup("+v mode change"),KVI_SMALLICON_VOICE,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Devoice",__tr_no_lookup("-v mode change"),KVI_SMALLICON_DEVOICE,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Mode",__tr_no_lookup("Multiple user mode change"),KVI_SMALLICON_MODE,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Key",__tr_no_lookup("Channel key change"),KVI_SMALLICON_KEY,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Limit",__tr_no_lookup("Channel limit change"),KVI_SMALLICON_LIMIT,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Ban",__tr_no_lookup("+b mode change"),KVI_SMALLICON_BAN,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Unban",__tr_no_lookup("-b mode change"),KVI_SMALLICON_UNBAN,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("BanExcept",__tr_no_lookup("+e mode change"),KVI_SMALLICON_BANEXCEPT,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("BanUnexcept",__tr_no_lookup("-e mode change"),KVI_SMALLICON_BANUNEXCEPT,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("InviteExcept",__tr_no_lookup("+I mode change"),KVI_SMALLICON_INVITEEXCEPT,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("InviteUnexcept",__tr_no_lookup("-I mode change"),KVI_SMALLICON_INVITEUNEXCEPT,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("ChanMode",__tr_no_lookup("Multiple channel mode change"),KVI_SMALLICON_CHANMODE,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Who",__tr_no_lookup("Who reply"),KVI_SMALLICON_WHO,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("DccRequest",__tr_no_lookup("DCC request"),KVI_SMALLICON_DCCREQUEST,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("DccMsg",__tr_no_lookup("DCC message"),KVI_SMALLICON_DCCMSG,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("DccError",__tr_no_lookup("DCC error"),KVI_SMALLICON_DCCERROR,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("NicknameProblem",__tr_no_lookup("Nickname problem"),KVI_SMALLICON_NICKNAMEPROBLEM,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("WhoisUser",__tr_no_lookup("Whois user reply"),KVI_SMALLICON_WHOISUSER,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("WhoisChannels",__tr_no_lookup("Whois channels reply"),KVI_SMALLICON_WHOISCHANNELS,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("WhoisIdle",__tr_no_lookup("Whois idle reply"),KVI_SMALLICON_WHOISIDLE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("WhoisServer",__tr_no_lookup("Whois server reply"),KVI_SMALLICON_WHOISSERVER,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("WhoisOther",__tr_no_lookup("Whois other reply"),KVI_SMALLICON_WHOISOTHER,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("CreationTime",__tr_no_lookup("Channel creation time reply"),KVI_SMALLICON_TIME,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("NotifyOnLine",__tr_no_lookup("Notify list joins"),KVI_SMALLICON_NOTIFYONLINE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("NotifyOffLine",__tr_no_lookup("Notify list leaves"),KVI_SMALLICON_NOTIFYOFFLINE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("OwnPrivmsgCrypted",__tr_no_lookup("Own encrypted private message"),KVI_SMALLICON_OWNPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("ChanPrivmsgCrypted",__tr_no_lookup("Channel encrypted private message"),KVI_SMALLICON_CHANPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("QueryPrivmsgCrypted",__tr_no_lookup("Query encrypted private message"),KVI_SMALLICON_QUERYPRIVMSGCRYPTED,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("DccChatMsg",__tr_no_lookup("DCC chat message"),KVI_SMALLICON_DCCCHATMSG,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("DccChatMsgCrypted",__tr_no_lookup("Encrypted DCC chat message"),KVI_SMALLICON_DCCCHATMSGCRYPTED,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("Irc",__tr_no_lookup("Login operations completed"),KVI_SMALLICON_IRC,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Kick",__tr_no_lookup("Kick action"),KVI_SMALLICON_KICK,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Links",__tr_no_lookup("Links reply"),KVI_SMALLICON_LINKS,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Spam",__tr_no_lookup("Spam report"),KVI_SMALLICON_SPAM,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("Icq",__tr_no_lookup("ICQ message"),KVI_SMALLICON_ICQ,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("IcqMessage",__tr_no_lookup("ICQ user-message"),KVI_SMALLICON_MESSAGE,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("IcqMessageSent",__tr_no_lookup("Outgoing ICQ user-message"),KVI_SMALLICON_MESSAGESENT,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("ChannelNotice",__tr_no_lookup("Channel notice"),KVI_SMALLICON_CHANNELNOTICE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("ChannelNoticeCrypted",__tr_no_lookup("Encrypted channel notice"),KVI_SMALLICON_CHANNELNOTICECRYPTED,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("QueryNotice",__tr_no_lookup("Query notice"),KVI_SMALLICON_QUERYNOTICE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("QueryNoticeCrypted",__tr_no_lookup("Encrypted query notice"),KVI_SMALLICON_QUERYNOTICECRYPTED,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("ServerNotice",__tr_no_lookup("Server notice"),KVI_SMALLICON_SERVERNOTICE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("HalfOp",__tr_no_lookup("Halfop mode change"),KVI_SMALLICON_HALFOP,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("CtcpReplyUnknown",__tr_no_lookup("Unknown CTCP reply"),KVI_SMALLICON_CTCPREPLYUNKNOWN,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("NickServ",__tr_no_lookup("NickServ message"),KVI_SMALLICON_NICKSERV,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("ChanServ",__tr_no_lookup("ChanServ message"),KVI_SMALLICON_CHANSERV,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Away",__tr_no_lookup("Away message"),KVI_SMALLICON_AWAY,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("Ident",__tr_no_lookup("Ident message"),KVI_SMALLICON_IDENT,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("List",__tr_no_lookup("Channel list message"),KVI_SMALLICON_LIST,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("HalfDeOp",__tr_no_lookup("Half-deop mode change"),KVI_SMALLICON_HALFDEOP,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("Invite",__tr_no_lookup("Invite message"),KVI_SMALLICON_INVITE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("Multimedia",__tr_no_lookup("Multimedia message"),KVI_SMALLICON_MULTIMEDIA,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("QueryTrace",__tr_no_lookup("Query trace message"),KVI_SMALLICON_QUERYTRACE,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Wallops",__tr_no_lookup("Wallops message"),KVI_SMALLICON_WALLOPS,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("JoinError",__tr_no_lookup("Join error message"),KVI_SMALLICON_NOCHANNEL,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("BroadcastPrivmsg",__tr_no_lookup("Broadcast private message"),KVI_SMALLICON_BROADCASTPRIVMSG,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("BroadcastNotice",__tr_no_lookup("Broadcast notice"),KVI_SMALLICON_BROADCASTNOTICE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("MeKick",__tr_no_lookup("Am kicked"),KVI_SMALLICON_MEKICK,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeOp",__tr_no_lookup("Am op'd"),KVI_SMALLICON_MEOP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeVoice",__tr_no_lookup("Am voiced"),KVI_SMALLICON_MEVOICE,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeDeOp",__tr_no_lookup("Am deop'd"),KVI_SMALLICON_MEDEOP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeDeVoice",__tr_no_lookup("Am devoiced"),KVI_SMALLICON_MEDEVOICE,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeHalfOp",__tr_no_lookup("Am halfop'd"),KVI_SMALLICON_MEHALFOP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeDeHalfOp",__tr_no_lookup("Am de-halfop'd"),KVI_SMALLICON_MEDEHALFOP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeBan",__tr_no_lookup("Ban matching my mask"),KVI_SMALLICON_MEBAN,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeUnban",__tr_no_lookup("Unban matching my mask"),KVI_SMALLICON_MEUNBAN,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeBanExcept",__tr_no_lookup("Ban exception matching my mask"),KVI_SMALLICON_MEBANEXCEPT,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeBanUnExcept",__tr_no_lookup("Ban unexception matching my mask"),KVI_SMALLICON_MEBANUNEXCEPT,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeInviteExcept",__tr_no_lookup("Invite exception matching my mask"),KVI_SMALLICON_MEINVITEEXCEPT,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeInviteUnexcept",__tr_no_lookup("Invite unexception matching my mask"),KVI_SMALLICON_MEINVITEUNEXCEPT,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("Ignore",__tr_no_lookup("Ignored user message"),KVI_SMALLICON_IGNORE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("Stats",__tr_no_lookup("Server statistics"),KVI_SMALLICON_STATS,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("SSL",__tr_no_lookup("SSL message"),KVI_SMALLICON_SSL,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("Search",__tr_no_lookup("Search"),KVI_SMALLICON_SEARCH,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("GenericSuccess",__tr_no_lookup("Generic success"),KVI_SMALLICON_CYANSQUARE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION("GenericStatus",__tr_no_lookup("Generic status"),KVI_SMALLICON_GREENSQUARE,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("GenericVerbose",__tr_no_lookup("Generic verbose message"),KVI_SMALLICON_DKGREENSQUARE,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("GenericWarning",__tr_no_lookup("Generic warning"),KVI_SMALLICON_YELLOWSQUARE,KVI_MSGTYPE_LEVEL_3), - MSGTYPE_OPTION_SPEC("GenericError",__tr_no_lookup("Generic error"),KVI_SMALLICON_REDSQUARE,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION_SPEC("GenericCritical",__tr_no_lookup("Generic critical error"),KVI_SMALLICON_BLACKSQUARE,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("ChanAdmin",__tr_no_lookup("Chan admin status set"),KVI_SMALLICON_CHANADMIN,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("ChanUnAdmin",__tr_no_lookup("Chan admin status unset"),KVI_SMALLICON_CHANUNADMIN,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeChanAdmin",__tr_no_lookup("Own chan admin status set"),KVI_SMALLICON_MECHANADMIN,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeChanUnAdmin",__tr_no_lookup("Own chan admin status unset"),KVI_SMALLICON_MECHANUNADMIN,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("UserOp",__tr_no_lookup("Userop mode change"),KVI_SMALLICON_USEROP,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("UserDeOp",__tr_no_lookup("User-deop mode change"),KVI_SMALLICON_DEUSEROP,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("MeUserOp",__tr_no_lookup("Am userop'd"),KVI_SMALLICON_MEUSEROP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeDeUserOp",__tr_no_lookup("Am de-userop'd"),KVI_SMALLICON_MEDEUSEROP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION_SPEC("Verbose",__tr_no_lookup("Verbose/Debug"),KVI_SMALLICON_BINARYTEXT,KviMircCntrl::DarkGray,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("ChanOwner",__tr_no_lookup("Chan owner status set"),KVI_SMALLICON_CHANOWNER,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("ChanUnOwner",__tr_no_lookup("Chan owner status unset"),KVI_SMALLICON_CHANUNOWNER,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeChanOwner",__tr_no_lookup("Own chan owner status set"),KVI_SMALLICON_MECHANOWNER,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeChanUnOwner",__tr_no_lookup("Own chan owner status unset"),KVI_SMALLICON_MECHANUNOWNER,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION_SPEC("ServerError",__tr_no_lookup("Server error"),KVI_SMALLICON_SERVERERROR,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION_SPEC("Help",__tr_no_lookup("Help"),KVI_SMALLICON_HELP,KviMircCntrl::DarkGreen,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1), - MSGTYPE_OPTION("TextEncoding",__tr_no_lookup("Text Encoding Server message"),KVI_SMALLICON_TEXTENCODING,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Echo",__tr_no_lookup("Normal text"),KviIconManager::None,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION_SPEC("Selection",__tr_no_lookup("Selection"),KviIconManager::None,KviMircCntrl::White,KviMircCntrl::Black,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION_SPEC("Highlight",__tr_no_lookup("Highlighted text"),KviIconManager::Alert,KviMircCntrl::White,KviMircCntrl::Black,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION_SPEC("Url",__tr_no_lookup("URL foreground"),KviIconManager::None,KviMircCntrl::Blue,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION_SPEC("Link",__tr_no_lookup("Link overlay foreground"),KviIconManager::None,KviMircCntrl::Blue,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION_SPEC("ParserError",__tr_no_lookup("Parser error"),KviIconManager::ParserError,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION_SPEC("ParserWarning",__tr_no_lookup("Parser warning"),KviIconManager::ParserWarning,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("HostLookup",__tr_no_lookup("Host lookup result"),KviIconManager::Server,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("SocketMessage",__tr_no_lookup("Socket message"),KviIconManager::SocketMessage,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("SocketWarning",__tr_no_lookup("Socket warning"),KviIconManager::SocketWarning,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION_SPEC("SocketError",__tr_no_lookup("Socket error"),KviIconManager::SocketError,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION_SPEC("SystemError",__tr_no_lookup("System error"),KviIconManager::SystemError,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("Raw",__tr_no_lookup("Raw data to server"),KviIconManager::Raw,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Connection",__tr_no_lookup("Connection status"),KviIconManager::World,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("SystemWarning",__tr_no_lookup("System warning"),KviIconManager::SystemWarning,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("SystemMessage",__tr_no_lookup("System message"),KviIconManager::SystemMessage,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("UnhandledReply",__tr_no_lookup("Unhandled server reply"),KviIconManager::UnHandled,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("ServerInfo",__tr_no_lookup("Server information"),KviIconManager::ServerInfo,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Motd",__tr_no_lookup("Server Message of the Day"),KviIconManager::Motd,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("ServerPing",__tr_no_lookup("Server ping"),KviIconManager::ServerPing,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Join",__tr_no_lookup("Join message"),KviIconManager::Join,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Part",__tr_no_lookup("Part message"),KviIconManager::Part,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Unrecognized",__tr_no_lookup("Unrecognized/broken message"),KviIconManager::Unrecognized,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Topic",__tr_no_lookup("Topic message"),KviIconManager::Topic,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("OwnPrivateMessage",__tr_no_lookup("Own private message"),KviIconManager::OwnPrivMsg,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("ChannelPrivateMessage",__tr_no_lookup("Channel private message"),KviIconManager::ChanPrivMsg,KVI_MSGTYPE_LEVEL_4), + MSGTYPE_OPTION("QueryPrivateMessage",__tr_no_lookup("Query private message"),KviIconManager::QueryPrivMsg,KVI_MSGTYPE_LEVEL_4), + MSGTYPE_OPTION("CtcpReply",__tr_no_lookup("CTCP reply"),KviIconManager::CtcpReply,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("CtcpRequestReplied",__tr_no_lookup("CTCP request replied"),KviIconManager::CtcpRequestReplied,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("CtcpRequestIgnored",__tr_no_lookup("CTCP request ignored"),KviIconManager::CtcpRequestIgnored,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("CtcpRequestFlood",__tr_no_lookup("CTCP request flood warning"),KviIconManager::CtcpRequestFlood,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("CtcpRequestUnknown",__tr_no_lookup("CTCP request unknown"),KviIconManager::CtcpRequestUnknown,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("Action",__tr_no_lookup("User action"),KviIconManager::Action,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("AvatarChange",__tr_no_lookup("Avatar change"),KviIconManager::Avatar,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("Quit",__tr_no_lookup("Quit message"),KviIconManager::Quit,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Split",__tr_no_lookup("Split message"),KviIconManager::Split,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("QuitSplit",__tr_no_lookup("Quit on netsplit message"),KviIconManager::QuitSplit,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Nick",__tr_no_lookup("Nick changes"),KviIconManager::Nick,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Op",__tr_no_lookup("+o mode change"),KviIconManager::Op,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Deop",__tr_no_lookup("-o mode change"),KviIconManager::DeOp,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Voice",__tr_no_lookup("+v mode change"),KviIconManager::Voice,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Devoice",__tr_no_lookup("-v mode change"),KviIconManager::DeVoice,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Mode",__tr_no_lookup("Multiple user mode change"),KviIconManager::Mode,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Key",__tr_no_lookup("Channel key change"),KviIconManager::Key,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Limit",__tr_no_lookup("Channel limit change"),KviIconManager::Limit,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Ban",__tr_no_lookup("+b mode change"),KviIconManager::Ban,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Unban",__tr_no_lookup("-b mode change"),KviIconManager::UnBan,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("BanExcept",__tr_no_lookup("+e mode change"),KviIconManager::BanExcept,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("BanUnexcept",__tr_no_lookup("-e mode change"),KviIconManager::BanUnExcept,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("InviteExcept",__tr_no_lookup("+I mode change"),KviIconManager::InviteExcept,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("InviteUnexcept",__tr_no_lookup("-I mode change"),KviIconManager::InviteUnExcept,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("ChanMode",__tr_no_lookup("Multiple channel mode change"),KviIconManager::ChanMode,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Who",__tr_no_lookup("Who reply"),KviIconManager::Who,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("DccRequest",__tr_no_lookup("DCC request"),KviIconManager::DccRequest,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("DccMsg",__tr_no_lookup("DCC message"),KviIconManager::DccMsg,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("DccError",__tr_no_lookup("DCC error"),KviIconManager::DccError,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("NicknameProblem",__tr_no_lookup("Nickname problem"),KviIconManager::NickNameProblem,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("WhoisUser",__tr_no_lookup("Whois user reply"),KviIconManager::WhoisUser,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("WhoisChannels",__tr_no_lookup("Whois channels reply"),KviIconManager::WhoisChannels,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("WhoisIdle",__tr_no_lookup("Whois idle reply"),KviIconManager::WhoisIdle,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("WhoisServer",__tr_no_lookup("Whois server reply"),KviIconManager::WhoisServer,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("WhoisOther",__tr_no_lookup("Whois other reply"),KviIconManager::WhoisOther,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("CreationTime",__tr_no_lookup("Channel creation time reply"),KviIconManager::Time,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("NotifyOnLine",__tr_no_lookup("Notify list joins"),KviIconManager::NotifyOnLine,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("NotifyOffLine",__tr_no_lookup("Notify list leaves"),KviIconManager::NotifyOffLine,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("OwnPrivmsgCrypted",__tr_no_lookup("Own encrypted private message"),KviIconManager::OwnPrivMsgCrypted,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("ChanPrivmsgCrypted",__tr_no_lookup("Channel encrypted private message"),KviIconManager::ChanPrivMsgCrypted,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("QueryPrivmsgCrypted",__tr_no_lookup("Query encrypted private message"),KviIconManager::QueryPrivMsgCrypted,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("DccChatMsg",__tr_no_lookup("DCC chat message"),KviIconManager::DccChatMsg,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("DccChatMsgCrypted",__tr_no_lookup("Encrypted DCC chat message"),KviIconManager::DccChatMsgCrypted,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("Irc",__tr_no_lookup("Login operations completed"),KviIconManager::Irc,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Kick",__tr_no_lookup("Kick action"),KviIconManager::Kick,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Links",__tr_no_lookup("Links reply"),KviIconManager::Links,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Spam",__tr_no_lookup("Spam report"),KviIconManager::Spam,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("Icq",__tr_no_lookup("ICQ message"),KviIconManager::Icq,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("IcqMessage",__tr_no_lookup("ICQ user-message"),KviIconManager::Message,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("IcqMessageSent",__tr_no_lookup("Outgoing ICQ user-message"),KviIconManager::MessageSent,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("ChannelNotice",__tr_no_lookup("Channel notice"),KviIconManager::ChannelNotice,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("ChannelNoticeCrypted",__tr_no_lookup("Encrypted channel notice"),KviIconManager::ChannelNoticeCrypted,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("QueryNotice",__tr_no_lookup("Query notice"),KviIconManager::QueryNotice,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("QueryNoticeCrypted",__tr_no_lookup("Encrypted query notice"),KviIconManager::QueryNoticeCrypted,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("ServerNotice",__tr_no_lookup("Server notice"),KviIconManager::ServerNotice,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("HalfOp",__tr_no_lookup("Halfop mode change"),KviIconManager::HalfOp,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("CtcpReplyUnknown",__tr_no_lookup("Unknown CTCP reply"),KviIconManager::CtcpReplyUnknown,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("NickServ",__tr_no_lookup("NickServ message"),KviIconManager::NickServ,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("ChanServ",__tr_no_lookup("ChanServ message"),KviIconManager::ChanServ,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Away",__tr_no_lookup("Away message"),KviIconManager::Away,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("Ident",__tr_no_lookup("Ident message"),KviIconManager::Ident,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("List",__tr_no_lookup("Channel list message"),KviIconManager::List,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("HalfDeOp",__tr_no_lookup("Half-deop mode change"),KviIconManager::HalfDeOp,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("Invite",__tr_no_lookup("Invite message"),KviIconManager::Invite,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("Multimedia",__tr_no_lookup("Multimedia message"),KviIconManager::MultiMedia,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("QueryTrace",__tr_no_lookup("Query trace message"),KviIconManager::QueryTrace,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Wallops",__tr_no_lookup("Wallops message"),KviIconManager::WallOps,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("JoinError",__tr_no_lookup("Join error message"),KviIconManager::NoChannel,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("BroadcastPrivmsg",__tr_no_lookup("Broadcast private message"),KviIconManager::BroadcastPrivMsg,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("BroadcastNotice",__tr_no_lookup("Broadcast notice"),KviIconManager::BroadcastNotice,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("MeKick",__tr_no_lookup("Am kicked"),KviIconManager::MeKick,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeOp",__tr_no_lookup("Am op'd"),KviIconManager::MeOp,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeVoice",__tr_no_lookup("Am voiced"),KviIconManager::MeVoice,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeDeOp",__tr_no_lookup("Am deop'd"),KviIconManager::MeDeOp,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeDeVoice",__tr_no_lookup("Am devoiced"),KviIconManager::MeDeVoice,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeHalfOp",__tr_no_lookup("Am halfop'd"),KviIconManager::MeHalfOp,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeDeHalfOp",__tr_no_lookup("Am de-halfop'd"),KviIconManager::MeDeHalfOp,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeBan",__tr_no_lookup("Ban matching my mask"),KviIconManager::MeBan,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeUnban",__tr_no_lookup("Unban matching my mask"),KviIconManager::MeUnBan,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeBanExcept",__tr_no_lookup("Ban exception matching my mask"),KviIconManager::MeBanExcept,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeBanUnExcept",__tr_no_lookup("Ban unexception matching my mask"),KviIconManager::MeBanUnExcept,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeInviteExcept",__tr_no_lookup("Invite exception matching my mask"),KviIconManager::MeInviteExcept,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeInviteUnexcept",__tr_no_lookup("Invite unexception matching my mask"),KviIconManager::MeInviteUnExcept,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("Ignore",__tr_no_lookup("Ignored user message"),KviIconManager::Ignore,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("Stats",__tr_no_lookup("Server statistics"),KviIconManager::Stats,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("SSL",__tr_no_lookup("SSL message"),KviIconManager::Ssl,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("Search",__tr_no_lookup("Search"),KviIconManager::Search,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("GenericSuccess",__tr_no_lookup("Generic success"),KviIconManager::CyanSquare,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION("GenericStatus",__tr_no_lookup("Generic status"),KviIconManager::GreenSquare,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("GenericVerbose",__tr_no_lookup("Generic verbose message"),KviIconManager::DarkGreenSquare,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("GenericWarning",__tr_no_lookup("Generic warning"),KviIconManager::YellowSquare,KVI_MSGTYPE_LEVEL_3), + MSGTYPE_OPTION_SPEC("GenericError",__tr_no_lookup("Generic error"),KviIconManager::RedSquare,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION_SPEC("GenericCritical",__tr_no_lookup("Generic critical error"),KviIconManager::BlackSquare,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("ChanAdmin",__tr_no_lookup("Chan admin status set"),KviIconManager::ChanAdmin,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("ChanUnAdmin",__tr_no_lookup("Chan admin status unset"),KviIconManager::ChanUnAdmin,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeChanAdmin",__tr_no_lookup("Own chan admin status set"),KviIconManager::MeChanAdmin,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeChanUnAdmin",__tr_no_lookup("Own chan admin status unset"),KviIconManager::MeChanUnAdmin,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("UserOp",__tr_no_lookup("Userop mode change"),KviIconManager::UserOp,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("UserDeOp",__tr_no_lookup("User-deop mode change"),KviIconManager::DeUserOp,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("MeUserOp",__tr_no_lookup("Am userop'd"),KviIconManager::MeUserOp,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeDeUserOp",__tr_no_lookup("Am de-userop'd"),KviIconManager::MeDeUserOp,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION_SPEC("Verbose",__tr_no_lookup("Verbose/Debug"),KviIconManager::BinaryText,KviMircCntrl::DarkGray,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("ChanOwner",__tr_no_lookup("Chan owner status set"),KviIconManager::ChanOwner,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("ChanUnOwner",__tr_no_lookup("Chan owner status unset"),KviIconManager::ChanUnOwner,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeChanOwner",__tr_no_lookup("Own chan owner status set"),KviIconManager::MeChanOwner,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeChanUnOwner",__tr_no_lookup("Own chan owner status unset"),KviIconManager::MeChanUnOwner,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION_SPEC("ServerError",__tr_no_lookup("Server error"),KviIconManager::ServerError,KviMircCntrl::Red,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION_SPEC("Help",__tr_no_lookup("Help"),KviIconManager::Help,KviMircCntrl::DarkGreen,KviMircCntrl::Transparent,KVI_MSGTYPE_LEVEL_1), + MSGTYPE_OPTION("TextEncoding",__tr_no_lookup("Text Encoding Server message"),KviIconManager::TextEncoding,KVI_MSGTYPE_LEVEL_1), // TODO: add icon and check what level means // Pragma: the message level is a warning level that is rendered in the WindowList // messages with higher level are rendered with more visible color (i.e. red) // messages with very high level might flash the tray and end up in the notifier // level 1 or 2 for standard torrent messages is ok - MSGTYPE_OPTION("BitTorrent",__tr_no_lookup("BitTorrent message"),KVI_SMALLICON_MULTIMEDIA,KVI_MSGTYPE_LEVEL_2), - MSGTYPE_OPTION("IrcOp",__tr_no_lookup("IRC Op status set"),KVI_SMALLICON_IRCOP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("DeIrcOp",__tr_no_lookup("IRC Op status unset"),KVI_SMALLICON_DEIRCOP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeIrcOp",__tr_no_lookup("Own IRC Op status set"),KVI_SMALLICON_MEIRCOP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("MeDeIrcOp",__tr_no_lookup("Own IRC Op status unset"),KVI_SMALLICON_MEDEIRCOP,KVI_MSGTYPE_LEVEL_5), - MSGTYPE_OPTION("Cap",__tr_no_lookup("Extended capability message"),KVI_SMALLICON_SERVERINFO,KVI_MSGTYPE_LEVEL_1) + MSGTYPE_OPTION("BitTorrent",__tr_no_lookup("BitTorrent message"),KviIconManager::MultiMedia,KVI_MSGTYPE_LEVEL_2), + MSGTYPE_OPTION("IrcOp",__tr_no_lookup("IRC Op status set"),KviIconManager::IrcOp,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("DeIrcOp",__tr_no_lookup("IRC Op status unset"),KviIconManager::DeIrcOp,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeIrcOp",__tr_no_lookup("Own IRC Op status set"),KviIconManager::MeIrcOp,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("MeDeIrcOp",__tr_no_lookup("Own IRC Op status unset"),KviIconManager::MeDeIrcOp,KVI_MSGTYPE_LEVEL_5), + MSGTYPE_OPTION("Cap",__tr_no_lookup("Extended capability message"),KviIconManager::ServerInfo,KVI_MSGTYPE_LEVEL_1) }; static const char * options_section_table[KVI_NUM_OPTION_SECT_FLAGS] = @@ -1130,7 +1130,7 @@ namespace KviTheme // we have a compatibility mode that can load them from // the old format kvi_smallicon_XY.png multiimage libraries. - for(int j=0;j<KVI_NUM_SMALL_ICONS;j++) + for(int j=0;j<KviIconManager::IconCount;j++) { QPixmap * pix = g_pIconManager->getSmallIcon(j); diff --git a/src/kvirc/kernel/KviTextIconManager.cpp b/src/kvirc/kernel/KviTextIconManager.cpp index 2e79e4386..6118fe7fd 100644 --- a/src/kvirc/kernel/KviTextIconManager.cpp +++ b/src/kvirc/kernel/KviTextIconManager.cpp @@ -24,7 +24,6 @@ #define _KVI_TEXTICONMANAGER_CPP_ -#include "KviIconManager.h" #include "KviTextIconManager.h" #include "KviCString.h" #include "KviPointerList.h" @@ -39,31 +38,31 @@ static KviTextIconAssocEntry default_associations[]= { - { ":)" , KVI_SMALLICON_SMILE }, - { ":*" , KVI_SMALLICON_KISS }, - { ":D" , KVI_SMALLICON_BIGGRIN }, - { ":(" , KVI_SMALLICON_UGLY }, - { ":/" , KVI_SMALLICON_ANGRY }, - { ":O" , KVI_SMALLICON_SURPRISED2 }, - { ":P" , KVI_SMALLICON_TONGUE }, - { ";)" , KVI_SMALLICON_EYE }, - { ":°)" , KVI_SMALLICON_TEARSMILE }, - { ":°" , KVI_SMALLICON_CRY }, - { ":S" , KVI_SMALLICON_AFRAID }, - { ":|" , KVI_SMALLICON_DEMORALIZED }, - { ":P°" , KVI_SMALLICON_SLURP }, + { ":)" , KviIconManager::Smile }, + { ":*" , KviIconManager::Kiss }, + { ":D" , KviIconManager::BigGrin }, + { ":(" , KviIconManager::Ugly }, + { ":/" , KviIconManager::Angry }, + { ":O" , KviIconManager::Surprised2 }, + { ":P" , KviIconManager::Tongue }, + { ";)" , KviIconManager::Eye }, + { ":°)" , KviIconManager::TearSmile }, + { ":°" , KviIconManager::Cry }, + { ":S" , KviIconManager::Afraid }, + { ":|" , KviIconManager::Demoralized }, + { ":P°" , KviIconManager::Slurp }, { 0 , 0 } }; KVIRC_API KviTextIconManager * g_pTextIconManager = 0; -KviTextIcon::KviTextIcon(int iId) -: m_iId(iId),m_pAnimatedPixmap(0) +KviTextIcon::KviTextIcon(KviIconManager::SmallIcon eIcon) +: m_eIcon(eIcon),m_pAnimatedPixmap(0) { } KviTextIcon::KviTextIcon(QString szFile) -: m_iId(-1), m_szFileName(szFile) +: m_eIcon(KviIconManager::None), m_szFileName(szFile) { QString szRetPath; @@ -85,7 +84,7 @@ KviTextIcon::KviTextIcon(QString szFile) KviTextIcon::KviTextIcon(KviTextIcon * pIcon) { - m_iId = pIcon->id(); + m_eIcon = pIcon->id(); m_szFileName = pIcon->m_szFileName; if(pIcon->m_pAnimatedPixmap) { @@ -101,22 +100,28 @@ KviTextIcon::~KviTextIcon() delete m_pAnimatedPixmap; } -void KviTextIcon::setId(int iId) +void KviTextIcon::setId(KviIconManager::SmallIcon eIcon) { - m_iId = iId; - m_szFileName=QString(); + m_eIcon = eIcon; + m_szFileName = QString(); +} + +void KviTextIcon::setId(int iIcon) +{ + m_eIcon = g_pIconManager->iconName(iIcon); + m_szFileName = QString(); } void KviTextIcon::setFilename(QString szFileName) { - m_iId = -1; + m_eIcon = KviIconManager::None; m_szFileName = szFileName; } QPixmap * KviTextIcon::pixmap() { - if(m_iId >= 0) - return g_pIconManager->getSmallIcon(m_iId); + if(m_eIcon >= 0) + return g_pIconManager->getSmallIcon(m_eIcon); // This is actually wrong (at least for the current implementation). // Users of this class expect the pointer to be permanent while @@ -144,11 +149,11 @@ void KviTextIconManager::clear() void KviTextIconManager::insert(const QString & szName, int iId) { - m_pTextIconDict->replace(szName, new KviTextIcon(iId)); + m_pTextIconDict->replace(szName, new KviTextIcon(g_pIconManager->iconName(iId))); emit changed(); } -void KviTextIconManager::insert(const QString & szName,KviTextIcon & icon) +void KviTextIconManager::insert(const QString & szName, KviTextIcon & icon) { m_pTextIconDict->replace(szName, new KviTextIcon(&icon)); emit changed(); @@ -249,7 +254,7 @@ int KviTextIconManager::load(const QString & szFileName, bool bMerge) pix=g_pIconManager->getPixmap(szTmp); if(!pix) { - iId = KVI_SMALLICON_HELP; + iId = KviIconManager::Help; pix = g_pIconManager->getSmallIcon(iId); } } @@ -262,7 +267,7 @@ int KviTextIconManager::load(const QString & szFileName, bool bMerge) { if(iId != -1) { - m_pTextIconDict->replace(*s,new KviTextIcon(iId)); + m_pTextIconDict->replace(*s,new KviTextIcon(g_pIconManager->iconName(iId))); } else { m_pTextIconDict->replace(*s,new KviTextIcon(szTmp)); } @@ -270,7 +275,7 @@ int KviTextIconManager::load(const QString & szFileName, bool bMerge) } else { if(iId != -1) { - m_pTextIconDict->replace(*s,new KviTextIcon(iId)); + m_pTextIconDict->replace(*s,new KviTextIcon(g_pIconManager->iconName(iId))); } else { m_pTextIconDict->replace(*s,new KviTextIcon(szTmp)); } diff --git a/src/kvirc/kernel/KviTextIconManager.h b/src/kvirc/kernel/KviTextIconManager.h index d851db0d0..fed631b63 100644 --- a/src/kvirc/kernel/KviTextIconManager.h +++ b/src/kvirc/kernel/KviTextIconManager.h @@ -36,6 +36,7 @@ #include "kvi_settings.h" #include "KviPointerHashTable.h" #include "KviAnimatedPixmap.h" +#include "KviIconManager.h" #include <QPixmap> @@ -59,16 +60,16 @@ typedef struct _KviTextIconAssocEntry class KVIRC_API KviTextIcon { protected: - int m_iId; - QString m_szFileName; - KviAnimatedPixmap * m_pAnimatedPixmap; + KviIconManager::SmallIcon m_eIcon; + QString m_szFileName; + KviAnimatedPixmap * m_pAnimatedPixmap; public: /** * \brief Constructs the icon object - * \param iId The id of the icon + * \param eIcon The id of the icon * \return KviTextIcon */ - KviTextIcon(int iId); + KviTextIcon(KviIconManager::SmallIcon eIcon); /** * \brief Constructs the icon object @@ -91,16 +92,24 @@ public: public: /** * \brief Returns the id of the icon - * \return int + * \return KviIconManager::SmallIcon */ - inline int id(){ return m_iId; }; + inline KviIconManager::SmallIcon id(){ return m_eIcon; }; /** * \brief Sets the id of the icon - * \param iId The id of the icon + * \param eIcon The id of the icon + * \return void + */ + void setId(KviIconManager::SmallIcon eIcon); + + /** + * \brief Sets the id of the icon + * \param iIcon The id of the icon + * \note This function is provided for convenience * \return void */ - void setId(int iId); + void setId(int iIcon); /** * \brief Sets the filename of the icon diff --git a/src/kvirc/kvs/KviKvsAction.h b/src/kvirc/kvs/KviKvsAction.h index dbf552724..8941f7d6a 100644 --- a/src/kvirc/kvs/KviKvsAction.h +++ b/src/kvirc/kvs/KviKvsAction.h @@ -32,6 +32,7 @@ #include "kvi_settings.h" #include "KviAction.h" +#include "KviIconManager.h" class KviKvsScript; diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp index beb438ee9..4a6aa613a 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp @@ -372,7 +372,7 @@ namespace KviKvsCoreFunctions KVSCF_PARAMETER("iconid",KVS_PT_UINT,0,uIco) KVSCF_PARAMETERS_END - if(uIco < KVI_NUM_SMALL_ICONS) + if(uIco < KviIconManager::IconCount) { KVSCF_pRetBuffer->setString(g_pIconManager->getSmallIconName(uIco)); } else { diff --git a/src/kvirc/kvs/KviKvsUserAction.cpp b/src/kvirc/kvs/KviKvsUserAction.cpp index cdb2c12b4..7f149262e 100644 --- a/src/kvirc/kvs/KviKvsUserAction.cpp +++ b/src/kvirc/kvs/KviKvsUserAction.cpp @@ -32,28 +32,28 @@ #include "KviCommandFormatter.h" KviKvsUserAction::KviKvsUserAction(QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIconId, - const QString &szSmallIconId, - unsigned int uFlags, - const QString &szKeySequence - ) - : KviKvsAction( - pParent, - szName, - szScriptCode, - szVisibleNameCode, - szDescriptionCode, - NULL, - szBigIconId, - szSmallIconId, - uFlags, - szKeySequence - ) + const QString &szName, + const QString &szScriptCode, + const QString &szVisibleNameCode, + const QString &szDescriptionCode, + const QString &szCategory, + const QString &szBigIconId, + const QString &szSmallIconId, + unsigned int uFlags, + const QString &szKeySequence +) +: KviKvsAction( + pParent, + szName, + szScriptCode, + szVisibleNameCode, + szDescriptionCode, + NULL, + szBigIconId, + szSmallIconId, + uFlags, + szKeySequence +) { QString szKvsName = "action::"; szKvsName += szName; @@ -89,15 +89,15 @@ KviKvsUserAction::~KviKvsUserAction() KviKvsUserAction * KviKvsUserAction::createInstance( QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIconId, - const QString &szSmallIconId, + const QString & szName, + const QString & szScriptCode, + const QString & szVisibleNameCode, + const QString & szDescriptionCode, + const QString & szCategory, + const QString & szBigIconId, + const QString & szSmallIconId, unsigned int uFlags, - const QString &szKeySequence + const QString & szKeySequence ) { return new KviKvsUserAction( @@ -114,34 +114,34 @@ KviKvsUserAction * KviKvsUserAction::createInstance( ); } -void KviKvsUserAction::exportToKvs(QString &szBuffer) +void KviKvsUserAction::exportToKvs(QString & szBuffer) { exportToKvs( - szBuffer, - m_szName, - scriptCode(), - visibleNameCode(), - descriptionCode(), - m_szCategory, - m_szBigIconId, - m_szSmallIconId, - m_uFlags, - m_szKeySequence - ); + szBuffer, + m_szName, + scriptCode(), + visibleNameCode(), + descriptionCode(), + m_szCategory, + m_szBigIconId, + m_szSmallIconId, + m_uFlags, + m_szKeySequence + ); } void KviKvsUserAction::exportToKvs( - QString &szBuffer, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, - const QString &szCategory, - const QString &szBigIconId, - const QString &szSmallIconId, - unsigned int uFlags, - const QString &szKeySequence - ) + QString & szBuffer, + const QString & szName, + const QString & szScriptCode, + const QString & szVisibleName, + const QString & szDescription, + const QString & szCategory, + const QString & szBigIconId, + const QString & szSmallIconId, + unsigned int uFlags, + const QString & szKeySequence +) { szBuffer += "action.create"; if(uFlags & NeedsContext) @@ -150,16 +150,21 @@ void KviKvsUserAction::exportToKvs( if(uFlags & NeedsConnection) { szBuffer += " -c"; - if(uFlags & EnableAtLogin)szBuffer += " -l"; + if(uFlags & EnableAtLogin) + szBuffer += " -l"; } } if(uFlags & InternalWindowMask) { QString szWins; - if(uFlags & WindowConsole)szWins += "x"; - if(uFlags & WindowChannel)szWins += "c"; - if(uFlags & WindowQuery)szWins += "q"; - if(uFlags & WindowDccChat)szWins += "d"; + if(uFlags & WindowConsole) + szWins += "x"; + if(uFlags & WindowChannel) + szWins += "c"; + if(uFlags & WindowQuery) + szWins += "q"; + if(uFlags & WindowDccChat) + szWins += "d"; szBuffer += " -w="; szBuffer += szWins; if(uFlags & (WindowConsole | WindowChannel | WindowQuery)) @@ -186,21 +191,21 @@ void KviKvsUserAction::exportToKvs( szBuffer += szName; szBuffer += "\","; - QString tmp; + QString szTmp; if(szVisibleName.contains('$')) { szBuffer += szVisibleName; szBuffer += ","; } else { - tmp = szVisibleName.trimmed(); - if(tmp.startsWith(QChar('\"')) && tmp.endsWith(QChar('\"'))) + szTmp = szVisibleName.trimmed(); + if(szTmp.startsWith(QChar('\"')) && szTmp.endsWith(QChar('\"'))) { - szBuffer += tmp; + szBuffer += szTmp; szBuffer += ","; } else { - tmp.replace("\"","\\\""); + szTmp.replace("\"","\\\""); szBuffer += "\""; - szBuffer += tmp; + szBuffer += szTmp; szBuffer += "\","; } } @@ -210,15 +215,15 @@ void KviKvsUserAction::exportToKvs( szBuffer += szDescription; szBuffer += ","; } else { - tmp = szDescription.trimmed(); - if(tmp.startsWith(QChar('\"')) && tmp.endsWith(QChar('\"'))) + szTmp = szDescription.trimmed(); + if(szTmp.startsWith(QChar('\"')) && szTmp.endsWith(QChar('\"'))) { - szBuffer += tmp; + szBuffer += szTmp; szBuffer += ","; } else { - tmp.replace("\"","\\\""); + szTmp.replace("\"","\\\""); szBuffer += "\""; - szBuffer += tmp; + szBuffer += szTmp; szBuffer += "\","; } } @@ -228,15 +233,15 @@ void KviKvsUserAction::exportToKvs( szBuffer += szBigIconId; szBuffer += ","; } else { - tmp = szBigIconId.trimmed(); - if(tmp.startsWith(QChar('\"')) && tmp.endsWith(QChar('\"'))) + szTmp = szBigIconId.trimmed(); + if(szTmp.startsWith(QChar('\"')) && szTmp.endsWith(QChar('\"'))) { - szBuffer += tmp; + szBuffer += szTmp; szBuffer += ","; } else { - tmp.replace("\"","\\\""); + szTmp.replace("\"","\\\""); szBuffer += "\""; - szBuffer += tmp; + szBuffer += szTmp; szBuffer += "\","; } } @@ -246,22 +251,22 @@ void KviKvsUserAction::exportToKvs( szBuffer += szSmallIconId; szBuffer += ")\n"; } else { - tmp = szSmallIconId.trimmed(); - if(tmp.startsWith(QChar('\"')) && tmp.endsWith(QChar('\"'))) + szTmp = szSmallIconId.trimmed(); + if(szTmp.startsWith(QChar('\"')) && szTmp.endsWith(QChar('\"'))) { - szBuffer += tmp; + szBuffer += szTmp; szBuffer += ")\n"; } else { - tmp.replace("\"","\\\""); + szTmp.replace("\"","\\\""); szBuffer += "\""; - szBuffer += tmp; + szBuffer += szTmp; szBuffer += "\")\n"; } } - tmp = szScriptCode; - KviCommandFormatter::blockFromBuffer(tmp); - szBuffer += tmp; + szTmp = szScriptCode; + KviCommandFormatter::blockFromBuffer(szTmp); + szBuffer += szTmp; szBuffer += "\n"; } diff --git a/src/kvirc/kvs/KviKvsUserAction.h b/src/kvirc/kvs/KviKvsUserAction.h index d6beabfa7..70cc144ab 100644 --- a/src/kvirc/kvs/KviKvsUserAction.h +++ b/src/kvirc/kvs/KviKvsUserAction.h @@ -55,26 +55,26 @@ public: // instead of the new operator. // See KviHeapObject.cpp for an explaination. static KviKvsUserAction * createInstance( - QObject * pParent, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleNameCode, - const QString &szDescriptionCode, - const QString &szCategory, - const QString &szBigIconId, - const QString &szSmallIconId, - unsigned int uFlags, - const QString &szKeySequence = QString() - ); + QObject * pParent, + const QString & szName, + const QString & szScriptCode, + const QString & szVisibleNameCode, + const QString & szDescriptionCode, + const QString & szCategory, + const QString & szBigIconId, + const QString & szSmallIcon, + unsigned int uFlags, + const QString & szKeySequence = QString() + ); void suicide() { delete this; }; protected: - QString m_szCategory; + QString m_szCategory; KviKvsScript * m_pDescriptionScript; KviKvsScript * m_pVisibleNameScript; protected: virtual bool isKviUserActionNeverOverrideThis(); - bool load(KviConfigurationFile * cfg); - void save(KviConfigurationFile * cfg); + bool load(KviConfigurationFile * pCfg); + void save(KviConfigurationFile * pCfg); public: virtual const QString & visibleName(); virtual const QString & description(); @@ -82,19 +82,18 @@ public: const QString & descriptionCode(); const QString & category(){ return m_szCategory; }; static void exportToKvs( - QString &szBuffer, - const QString &szName, - const QString &szScriptCode, - const QString &szVisibleName, - const QString &szDescription, - const QString &szCategory, - const QString &szBigIcon, - const QString &szSmallIcon, - unsigned int uFlags, - const QString &szKeySequence - ); - void exportToKvs(QString &szBuffer); + QString & szBuffer, + const QString & szName, + const QString & szScriptCode, + const QString & szVisibleName, + const QString & szDescription, + const QString & szCategory, + const QString & szBigIcon, + const QString & szSmallIcon, + unsigned int uFlags, + const QString & szKeySequence + ); + void exportToKvs(QString & szBuffer); }; - -#endif //!_KVI_KVS_USERACTION_H_ +#endif // _KVI_KVS_USERACTION_H_ diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp index 71c80dd04..0eb795097 100644 --- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp @@ -926,7 +926,7 @@ void KviIrcServerParser::parseLiteralPrivmsg(KviIrcMessage *msg) iFlags |= KviConsoleWindow::NoNotifier; QString szMsg = Qt::escape(szMsgText); //qDebug("KviIrcServerParser_literalHandlers.cpp:908 debug: %s",szMsgText.data()); - g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYPRIVMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); + g_pApp->notifierMessage(query,KviIconManager::QueryPrivMsg,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); } } @@ -1291,7 +1291,7 @@ void KviIrcServerParser::parseLiteralNotice(KviIrcMessage *msg) iFlags |= KviConsoleWindow::NoNotifier; QString szMsg = Qt::escape(szMsgText); //qDebug("KviIrcServerParser_literalHandlers.cpp:1262 debug: %s",szMsgText.data()); - g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYNOTICE,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); + g_pApp->notifierMessage(query,KviIconManager::QueryNotice,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); } } diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp index 42b5523b2..e5daf26ba 100644 --- a/src/kvirc/ui/KviChannelWindow.cpp +++ b/src/kvirc/ui/KviChannelWindow.cpp @@ -143,10 +143,12 @@ KviChannelWindow::KviChannelWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpC // and the related buttons - m_pDoubleViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDEDOUBLEVIEW,KVI_SMALLICON_SHOWDOUBLEVIEW,__tr2qs("Split View"),buttonContainer(),false,"double_view_button"); + m_pDoubleViewButton = new KviWindowToolPageButton(KviIconManager::HideDoubleView,KviIconManager::ShowDoubleView,__tr2qs("Split View"),buttonContainer(),false); + m_pDoubleViewButton->setObjectName("double_view_button"); connect(m_pDoubleViewButton,SIGNAL(clicked()),this,SLOT(toggleDoubleView())); - m_pListViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("User List"),buttonContainer(),true,"list_view_button"); + m_pListViewButton = new KviWindowToolPageButton(KviIconManager::HideListView,KviIconManager::ShowListView,__tr2qs("User List"),buttonContainer(),true); + m_pListViewButton->setObjectName("list_view_button"); connect(m_pListViewButton,SIGNAL(clicked()),this,SLOT(toggleListView())); //list modes (bans, bans exceptions, etc) @@ -162,7 +164,8 @@ KviChannelWindow::KviChannelWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpC if(szDescription.isEmpty()) szDescription = __tr2qs("Mode \"%1\" Masks").arg(cMode); - pButton = new KviWindowToolPageButton(KVI_SMALLICON_UNBAN,KVI_SMALLICON_BAN,szDescription,buttonContainer(),false,"ban_editor_button"); + pButton = new KviWindowToolPageButton(KviIconManager::UnBan,KviIconManager::Ban,szDescription,buttonContainer(),false); + pButton->setObjectName("ban_editor_button"); connect(pButton,SIGNAL(clicked()),this,SLOT(toggleListModeEditor())); m_pListEditorButtons.insert(cMode, pButton); @@ -179,39 +182,41 @@ KviChannelWindow::KviChannelWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpC QString szDescription = pServerInfo->getChannelModeDescription(cMode); if(szDescription.isEmpty()) szDescription = __tr2qs("Mode \"%1\" Masks").arg(cMode); - int iIconOn, iIconOff; + KviIconManager::SmallIcon eIconOn, eIconOff; switch(cMode) { case 'e': - iIconOn = KVI_SMALLICON_BANUNEXCEPT; - iIconOff = KVI_SMALLICON_BANEXCEPT; + eIconOn = KviIconManager::BanUnExcept; + eIconOff = KviIconManager::BanExcept; break; case 'I': - iIconOn = KVI_SMALLICON_INVITEUNEXCEPT; - iIconOff = KVI_SMALLICON_INVITEEXCEPT; + eIconOn = KviIconManager::InviteUnExcept; + eIconOff = KviIconManager::InviteExcept; break; case 'a': - iIconOn = KVI_SMALLICON_CHANUNADMIN; - iIconOff = KVI_SMALLICON_CHANADMIN; + eIconOn = KviIconManager::ChanUnAdmin; + eIconOff = KviIconManager::ChanAdmin; break; case 'q': // this could also be quiet bans.. - iIconOn = KVI_SMALLICON_CHANUNOWNER; - iIconOff = KVI_SMALLICON_CHANOWNER; + eIconOn = KviIconManager::ChanUnOwner; + eIconOff = KviIconManager::ChanOwner; break; default: - iIconOn = KVI_SMALLICON_UNBAN; - iIconOff = KVI_SMALLICON_BAN; + eIconOn = KviIconManager::UnBan; + eIconOff = KviIconManager::Ban; break; } - pButton = new KviWindowToolPageButton(iIconOn,iIconOff,szDescription,buttonContainer(),false,"list_mode_editor_button"); + pButton = new KviWindowToolPageButton(eIconOn,eIconOff,szDescription,buttonContainer(),false); + pButton->setObjectName("list_mode_editor_button"); connect(pButton,SIGNAL(clicked()),this,SLOT(toggleListModeEditor())); m_pListEditorButtons.insert(cMode, pButton); } } - m_pModeEditorButton = new KviWindowToolPageButton(KVI_SMALLICON_CHANMODEHIDE,KVI_SMALLICON_CHANMODE,__tr2qs("Mode Editor"),buttonContainer(),false,"mode_editor_button"); + m_pModeEditorButton = new KviWindowToolPageButton(KviIconManager::ChanModeHide,KviIconManager::ChanMode,__tr2qs("Mode Editor"),buttonContainer(),false); + m_pModeEditorButton->setObjectName("mode_editor_button"); connect(m_pModeEditorButton,SIGNAL(clicked()),this,SLOT(toggleModeEditor())); m_pModeEditor = 0; @@ -604,7 +609,7 @@ void KviChannelWindow::removeMasks(KviMaskEditor * ed, KviPointerList<KviMaskEnt QPixmap * KviChannelWindow::myIconPtr() { - return g_pIconManager->getSmallIcon((m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN) ? KVI_SMALLICON_DEADCHANNEL : KVI_SMALLICON_CHANNEL); + return g_pIconManager->getSmallIcon((m_iStateFlags & KVI_CHANNEL_STATE_DEADCHAN) ? KviIconManager::DeadChannel : KviIconManager::Channel); } void KviChannelWindow::resizeEvent(QResizeEvent *) diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp index d78c64f2d..44e0a7160 100644 --- a/src/kvirc/ui/KviConsoleWindow.cpp +++ b/src/kvirc/ui/KviConsoleWindow.cpp @@ -116,7 +116,7 @@ KviConsoleWindow::KviConsoleWindow(KviMainWindow * lpFrm,int iFlags) m_pAddressEdit->setAutoCompletion(true); m_pAddressEdit->setDuplicatesEnabled(false); m_pAddressEdit->setEditable(true); - m_pAddressEdit->addItem(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL))),""); + m_pAddressEdit->addItem(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Url))),""); recentUrlsChanged(); m_pAddressEdit->setInsertPolicy(QComboBox::NoInsert); m_pAddressEdit->setMinimumHeight(24); //icon is 16px, + margins @@ -138,7 +138,7 @@ KviConsoleWindow::KviConsoleWindow(KviMainWindow * lpFrm,int iFlags) // FIXME: #warning "Button to show/hide the notifyListView (NOT DELETE RE_CREATE!)" // The userlist on the right //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); - m_pNotifyViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Notify List"),buttonContainer(),true,"list_view_button"); + m_pNotifyViewButton = new KviWindowToolPageButton(KviIconManager::HideListView,KviIconManager::ShowListView,__tr2qs("Notify List"),buttonContainer(),true); connect(m_pNotifyViewButton,SIGNAL(clicked()),this,SLOT(toggleNotifyView())); m_pNotifyListView = new KviUserListView(m_pSplitter,m_pNotifyViewButton,0,this,19,__tr2qs("Notify List"),"notify_list_view"); @@ -161,7 +161,7 @@ void KviConsoleWindow::recentUrlsChanged() it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentIrcUrls).end(); ++it ) { - m_pAddressEdit->addItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL)),*it); + m_pAddressEdit->addItem(*(g_pIconManager->getSmallIcon(KviIconManager::Url)),*it); } // m_pAddressEdit->setCurrentText(cur); int i = m_pAddressEdit->findText(cur); @@ -1161,7 +1161,7 @@ void KviConsoleWindow::fillCaptionBuffers() QPixmap * KviConsoleWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(isConnected() ? KVI_SMALLICON_LINKS : KVI_SMALLICON_CONSOLE); + return g_pIconManager->getSmallIcon(isConnected() ? KviIconManager::Links : KviIconManager::Console); } void KviConsoleWindow::getWindowListTipText(QString &buffer) diff --git a/src/kvirc/ui/KviCryptController.cpp b/src/kvirc/ui/KviCryptController.cpp index 2ebbaf751..416ff991a 100644 --- a/src/kvirc/ui/KviCryptController.cpp +++ b/src/kvirc/ui/KviCryptController.cpp @@ -73,7 +73,7 @@ QGridLayout * pLayout = new QGridLayout(this); QLabel * pLabel = new QLabel(this); - pLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LOCKED))); + pLabel->setPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Locked))); pLayout->addWidget(pLabel,0,0); pLabel = new QLabel(__tr2qs("Cryptography/text transformation"),this); pLayout->addWidget(pLabel,0,1,1,3); diff --git a/src/kvirc/ui/KviCtcpPageDialog.cpp b/src/kvirc/ui/KviCtcpPageDialog.cpp index 7fc3c1ec6..78272c428 100644 --- a/src/kvirc/ui/KviCtcpPageDialog.cpp +++ b/src/kvirc/ui/KviCtcpPageDialog.cpp @@ -62,7 +62,7 @@ KviCtcpPageDialog::KviCtcpPageDialog() setMinimumSize(300,200); setMaximumSize(780,580); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CTCPREQUESTREPLIED))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::CtcpRequestReplied))); } KviCtcpPageDialog::~KviCtcpPageDialog() diff --git a/src/kvirc/ui/KviDebugWindow.cpp b/src/kvirc/ui/KviDebugWindow.cpp index f950a319f..965698891 100644 --- a/src/kvirc/ui/KviDebugWindow.cpp +++ b/src/kvirc/ui/KviDebugWindow.cpp @@ -95,7 +95,7 @@ void KviDebugWindow::fillCaptionBuffers() QPixmap * KviDebugWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_BUG); + return g_pIconManager->getSmallIcon(KviIconManager::Bug); } void KviDebugWindow::resizeEvent(QResizeEvent *) diff --git a/src/kvirc/ui/KviFileDialog.cpp b/src/kvirc/ui/KviFileDialog.cpp index 1ef2fe67b..c41fd3cce 100644 --- a/src/kvirc/ui/KviFileDialog.cpp +++ b/src/kvirc/ui/KviFileDialog.cpp @@ -43,7 +43,7 @@ extern KviMediaManager * g_pMediaManager; KviFileDialog::KviFileDialog(const QString & szDirName, const QString & szFilter, QWidget * pParent, const char * name, bool bModal) : KviTalFileDialog(szDirName,szFilter,pParent,name,bModal) { - setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)))); + setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Folder)))); } KviFileDialog::~KviFileDialog() diff --git a/src/kvirc/ui/KviImageDialog.cpp b/src/kvirc/ui/KviImageDialog.cpp index 909f84d50..b19c083d9 100644 --- a/src/kvirc/ui/KviImageDialog.cpp +++ b/src/kvirc/ui/KviImageDialog.cpp @@ -218,20 +218,21 @@ void KviImageDialog::jobTerminated() void KviImageDialog::heartbeat() { - if(m_iJobIndexHelper == 0)m_pListBox->clear(); - + if(m_iJobIndexHelper == 0) + m_pListBox->clear(); switch(m_iJobType) { case KID_TYPE_BUILTIN_IMAGES_SMALL: { - if(m_iJobIndexHelper >= KVI_NUM_SMALL_ICONS) + if(m_iJobIndexHelper >= KviIconManager::IconCount) { jobTerminated(); return; } int max = m_iJobIndexHelper + 15; - if(max > KVI_NUM_SMALL_ICONS)max = KVI_NUM_SMALL_ICONS; + if(max > KviIconManager::IconCount) + max = KviIconManager::IconCount; while(m_iJobIndexHelper < max) { QString id = g_pIconManager->getSmallIconName(m_iJobIndexHelper); diff --git a/src/kvirc/ui/KviImageDialog.h b/src/kvirc/ui/KviImageDialog.h index 4c92c73b4..cb11817ab 100644 --- a/src/kvirc/ui/KviImageDialog.h +++ b/src/kvirc/ui/KviImageDialog.h @@ -27,6 +27,7 @@ #include "kvi_settings.h" #include "KviDynamicToolTip.h" #include "KviTalListWidget.h" +#include "KviIconManager.h" #include <QDialog> #include <QComboBox> @@ -82,7 +83,7 @@ protected: QString m_szJobPath; QStringList m_lJobFileList; - int m_iJobIndexHelper; + int m_iJobIndexHelper; QString m_szSelectedImage; diff --git a/src/kvirc/ui/KviInput.cpp b/src/kvirc/ui/KviInput.cpp index 0656783ed..463def493 100644 --- a/src/kvirc/ui/KviInput.cpp +++ b/src/kvirc/ui/KviInput.cpp @@ -108,12 +108,12 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView) QIcon is1; if(KVI_OPTION_BOOL(KviOption_boolEnableInputHistory))//G&N mar 2005 { - is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME))); + is1.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Time))); m_pHistoryButton->setIcon(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br><Ctrl+PageUp>")); connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked())); } else { - is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT))); + is1.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::QuitSplit))); m_pHistoryButton->setIcon(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled")); } @@ -123,7 +123,7 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView) m_pIconButton->setIconSize(QSize(22,22)); QIcon is3; - is3.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BIGGRIN))); + is3.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::BigGrin))); m_pIconButton->setIcon(is3); KviTalToolTip::add(m_pIconButton,__tr2qs("Show Icons Popup<br><Ctrl+I><br>See also /help texticons")); connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked())); @@ -134,8 +134,8 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView) m_pCommandlineModeButton->setIconSize(QSize(22,22)); m_pCommandlineModeButton->setCheckable(true); QIcon is0; - is0.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYSMILE)),QIcon::Normal,QIcon::On); - is0.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYKVS)),QIcon::Normal,QIcon::Off); + is0.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::SaySmile)),QIcon::Normal,QIcon::On); + is0.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::SayKvs)),QIcon::Normal,QIcon::Off); m_pCommandlineModeButton->setIcon(is0); KviTalToolTip::add(m_pCommandlineModeButton,__tr2qs("User friendly commandline mode<br>See also /help commandline")); if(KVI_OPTION_BOOL(KviOption_boolCommandlineInUserFriendlyModeByDefault)) @@ -148,8 +148,8 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView) m_pMultiEditorButton->setCheckable(true); m_pMultiEditorButton->setIconSize(QSize(22,22)); QIcon is2; - is2.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIcon::Normal,QIcon::On); - is2.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIcon::Normal,QIcon::Off); + is2.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Terminal)),QIcon::Normal,QIcon::On); + is2.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Terminal)),QIcon::Normal,QIcon::Off); m_pMultiEditorButton->setIcon(is2); QString szTip = __tr2qs("Multi-line Editor<br><Alt+Return>"); KviTalToolTip::add(m_pMultiEditorButton,szTip); @@ -396,13 +396,13 @@ void KviInput::applyOptions() if(KVI_OPTION_BOOL(KviOption_boolEnableInputHistory)) { QIcon is1; - is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME))); + is1.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Time))); m_pHistoryButton->setIcon(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br><Ctrl+PageUp>")); connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked())); } else { QIcon is1; - is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT))); + is1.addPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::QuitSplit))); m_pHistoryButton->setIcon(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled")); m_pHistoryButton->disconnect(SIGNAL(clicked())); diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp index 994c1d5d3..764a00e37 100644 --- a/src/kvirc/ui/KviInputEditor.cpp +++ b/src/kvirc/ui/KviInputEditor.cpp @@ -831,7 +831,7 @@ void KviInputEditor::mousePressEvent(QMouseEvent * e) } } - g_pInputPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BIGGRIN)),__tr2qs("Insert Icon"),m_pIconMenu); + g_pInputPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::BigGrin)),__tr2qs("Insert Icon"),m_pIconMenu); QInputContext *qic = g_pApp->inputContext(); if (qic) { diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp index 2352433f8..35e7f4378 100644 --- a/src/kvirc/ui/KviIrcView.cpp +++ b/src/kvirc/ui/KviIrcView.cpp @@ -304,7 +304,7 @@ KviIrcView::KviIrcView(QWidget *parent,KviMainWindow *pFrm,KviWindow *pWnd) m_pToolsButton->setObjectName("btntools"); m_pToolsButton->setAutoFillBackground(true); - QIcon is1(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU))); + QIcon is1(*(g_pIconManager->getSmallIcon(KviIconManager::PopupMenu))); m_pToolsButton->setAutoRaise(true); m_pToolsButton->setIcon(is1); @@ -1425,7 +1425,7 @@ no_selection_paint: // when building the text icon block, but.. better safe than sorry: // so... we lost some icons ? wrong associations ? // recover it by displaying the "question mark" icon - daIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_HELP); // must be there, eventually null pixmap :D + daIcon = g_pIconManager->getSmallIcon(KviIconManager::Help); // must be there, eventually null pixmap :D } int moredown = 1; //used to center imager vertically (pixels which the image is moved more down) moredown += ((m_iFontLineSpacing - daIcon->height()) / 2); @@ -1574,7 +1574,7 @@ no_selection_paint: * y++; pa.drawLine(x-3,y,x+3,y); * y++; pa.drawLine(x-4,y,x+4,y); */ - QPixmap * pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_UNREADTEXT); + QPixmap * pIcon = g_pIconManager->getSmallIcon(KviIconManager::UnreadText); m_lineMarkArea = QRect(x,y,16,16); pa.drawPixmap(x,y,16,16,*pIcon); //pa.setRasterOp(CopyROP); @@ -2065,13 +2065,13 @@ void KviIrcView::showToolsPopup() m_pToolsPopup->clear(); if(m_pToolWidget) - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Hide Find Window"),this,SLOT(toggleToolWidget())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Search)),__tr2qs("Hide Find Window"),this,SLOT(toggleToolWidget())); else - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Show Find Window"),this,SLOT(toggleToolWidget())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Search)),__tr2qs("Show Find Window"),this,SLOT(toggleToolWidget())); m_pToolsPopup->insertSeparator(); - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLUS)),__tr2qs("Zoom In"),this,SLOT(increaseFontSize())); - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs("Zoom Out"),this,SLOT(decreaseFontSize())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Plus)),__tr2qs("Zoom In"),this,SLOT(increaseFontSize())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Minus)),__tr2qs("Zoom Out"),this,SLOT(decreaseFontSize())); m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Font..."),this,SLOT(chooseFont())); m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Background..."),this,SLOT(chooseBackground())); int id = m_pToolsPopup->insertItem(__tr2qs("Reset Temporary Background"),this,SLOT(resetBackground())); diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp index 9ea71447d..54a5972c8 100644 --- a/src/kvirc/ui/KviIrcView_events.cpp +++ b/src/kvirc/ui/KviIrcView_events.cpp @@ -798,7 +798,7 @@ void KviIrcView::doMarkerToolTip(const QRect &rct) { QString tip; tip = "<table width=\"100%\">" \ - "<tr><td valign=\"center\"><img src=\"" + g_pIconManager->getSmallIconResourceName(KVI_SMALLICON_UNREADTEXT) + "\"> <u><font color=\"blue\"><nowrap>"; + "<tr><td valign=\"center\"><img src=\"" + g_pIconManager->getSmallIconResourceName(KviIconManager::UnreadText) + "\"> <u><font color=\"blue\"><nowrap>"; tip += __tr2qs("Scroll up to read from the last read line"); tip += "</nowrap></font></u></td></tr><tr><td>"; tip += "</td></tr></table>"; @@ -824,7 +824,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe if(!KVI_OPTION_BOOL(KviOption_boolEnableUrlLinkToolTip)) return; tip = "<table width=\"100%\">" \ - "<tr><td valign=\"center\"><img src=\"" + g_pIconManager->getSmallIconResourceName(KVI_SMALLICON_URL) + "\"> <u><font color=\"blue\"><nowrap>"; + "<tr><td valign=\"center\"><img src=\"" + g_pIconManager->getSmallIconResourceName(KviIconManager::Url) + "\"> <u><font color=\"blue\"><nowrap>"; if(linkText.length() > 50) { tip += linkText.left(47); @@ -847,7 +847,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe if(!KVI_OPTION_BOOL(KviOption_boolEnableHostLinkToolTip)) return; tip = "<table width=\"100%\">" \ - "<tr><td valign=\"center\"><img src=\"" + g_pIconManager->getSmallIconResourceName(KVI_SMALLICON_SERVER) + "\"> <u><font color=\"blue\"><nowrap>"; + "<tr><td valign=\"center\"><img src=\"" + g_pIconManager->getSmallIconResourceName(KviIconManager::Server) + "\"> <u><font color=\"blue\"><nowrap>"; if(linkText.length() > 50) { tip += linkText.left(47); @@ -874,7 +874,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe // FIXME: #warning "Spit out some server info...hub ?...registered ?" tip = "<table width=\"100%\">" \ - "<tr><td valign=\"center\"><img src=\"" + g_pIconManager->getSmallIconResourceName(KVI_SMALLICON_IRC) + "\"> <u><font color=\"blue\"><nowrap>"; + "<tr><td valign=\"center\"><img src=\"" + g_pIconManager->getSmallIconResourceName(KviIconManager::Irc) + "\"> <u><font color=\"blue\"><nowrap>"; if(linkText.length() > 50) { @@ -962,7 +962,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe { QString szChan = linkText; QString buf; - tip = "<img src=\"" + g_pIconManager->getSmallIconResourceName(KVI_SMALLICON_CHANNEL) + "\"> "; + tip = "<img src=\"" + g_pIconManager->getSmallIconResourceName(KviIconManager::Channel) + "\"> "; if(szCmd.length()>0) szChan=szCmd; KviChannelWindow * c = console()->connection()->findChannel(szChan); diff --git a/src/kvirc/ui/KviIrcView_tools.cpp b/src/kvirc/ui/KviIrcView_tools.cpp index 143de41fd..c28f36b85 100644 --- a/src/kvirc/ui/KviIrcView_tools.cpp +++ b/src/kvirc/ui/KviIrcView_tools.cpp @@ -100,7 +100,7 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * pParent) gl->addWidget(l,0,0); QPushButton *tb = new QPushButton(this); - tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)))); + tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Close)))); tb->setObjectName("down_arrow"); tb->setFixedSize(16,16); tb->setAutoRepeat(false); diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp index 0968728e0..a832b9a63 100644 --- a/src/kvirc/ui/KviMainWindow.cpp +++ b/src/kvirc/ui/KviMainWindow.cpp @@ -936,7 +936,7 @@ void KviMainWindow::fillToolBarsPopup(KviTalPopupMenu * p) p->insertSeparator(); p->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)), + *(g_pIconManager->getSmallIcon(KviIconManager::ToolBar)), __tr2qs("Customize..."), this, SLOT(customizeToolBars()) diff --git a/src/kvirc/ui/KviMaskEditor.cpp b/src/kvirc/ui/KviMaskEditor.cpp index 5a55b4e07..5ee693bcb 100644 --- a/src/kvirc/ui/KviMaskEditor.cpp +++ b/src/kvirc/ui/KviMaskEditor.cpp @@ -25,7 +25,6 @@ #include "KviMaskEditor.h" #include "KviLocale.h" -#include "KviIconManager.h" #include "KviQString.h" #include "KviChannelWindow.h" #include "KviIrcConnectionServerInfo.h" @@ -86,12 +85,12 @@ KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEdi m_pOkButton= new QPushButton(__tr2qs("Ok"),this); connect(m_pOkButton,SIGNAL(clicked()), this, SLOT(accept())); g->addWidget(m_pOkButton,2,1); - m_pOkButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + m_pOkButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); m_pChancelButton= new QPushButton(__tr2qs("Cancel"),this); connect(m_pChancelButton,SIGNAL(clicked()), this, SLOT(reject())); g->addWidget(m_pChancelButton,2,2); - m_pChancelButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + m_pChancelButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); } KviMaskInputDialog::~KviMaskInputDialog() @@ -142,28 +141,28 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviChannelWindow * pChannel,KviWindow switch(cMode) { case 'b': - m_iIconId = KVI_SMALLICON_BAN; + m_eIcon = KviIconManager::Ban; break; case 'e': - m_iIconId = KVI_SMALLICON_BANEXCEPT; + m_eIcon = KviIconManager::BanExcept; break; case 'I': - m_iIconId = KVI_SMALLICON_INVITEEXCEPT; + m_eIcon = KviIconManager::InviteExcept; break; case 'a': - m_iIconId = KVI_SMALLICON_CHANADMIN; + m_eIcon = KviIconManager::ChanAdmin; break; case 'q': // this could also be quiet bans.. - m_iIconId = KVI_SMALLICON_CHANOWNER; + m_eIcon = KviIconManager::ChanOwner; break; default: - m_iIconId = KVI_SMALLICON_BAN; + m_eIcon = KviIconManager::Ban; break; } QLabel * l = new QLabel("",this); - l->setPixmap(*(g_pIconManager->getSmallIcon(m_iIconId))); + l->setPixmap(*(g_pIconManager->getSmallIcon(m_eIcon))); g->addWidget(l,0,0); l = new QLabel(szDescription,this); @@ -204,12 +203,12 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviChannelWindow * pChannel,KviWindow m_pRemoveMask->setFocusProxy(this); g->addWidget(m_pRemoveMask,4,1); connect(m_pRemoveMask,SIGNAL(clicked()),this,SLOT(removeClicked())); - m_pRemoveMask->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); + m_pRemoveMask->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DeleteItem))); m_pAddButton = new QPushButton(__tr2qs("&Add"),this); g->addWidget(m_pAddButton,4,0); connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); - m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); + m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem))); g->setColumnStretch(1,1); @@ -306,7 +305,7 @@ void KviMaskEditor::addMask(KviMaskEntry *e) { KviMaskItem *it; it = new KviMaskItem(m_pMaskBox,e); - it->setIcon(0,*(g_pIconManager->getSmallIcon(m_iIconId))); + it->setIcon(0,*(g_pIconManager->getSmallIcon(m_eIcon))); } void KviMaskEditor::removeMask(KviMaskEntry *e) diff --git a/src/kvirc/ui/KviMaskEditor.h b/src/kvirc/ui/KviMaskEditor.h index cf34c13d6..f334f349c 100644 --- a/src/kvirc/ui/KviMaskEditor.h +++ b/src/kvirc/ui/KviMaskEditor.h @@ -28,8 +28,9 @@ #include "KviPointerList.h" #include "KviCString.h" #include "KviWindowToolWidget.h" -#include <QTreeWidget> +#include "KviIconManager.h" +#include <QTreeWidget> #include <QPushButton> #include <QDialog> #include <QLineEdit> @@ -99,13 +100,13 @@ public: char cMode,const char * name); ~KviMaskEditor(); protected: - KviChannelWindow * m_pChannel; - QTreeWidget * m_pMaskBox; - QPushButton * m_pRemoveMask; - QPushButton * m_pAddButton; - QLineEdit * m_pSearch; - char m_cFlag; - int m_iIconId; + KviChannelWindow * m_pChannel; + QTreeWidget * m_pMaskBox; + QPushButton * m_pRemoveMask; + QPushButton * m_pAddButton; + QLineEdit * m_pSearch; + char m_cFlag; + KviIconManager::SmallIcon m_eIcon; public: char flag(){ return m_cFlag; }; void addMask(KviMaskEntry *e); diff --git a/src/kvirc/ui/KviMdiManager.cpp b/src/kvirc/ui/KviMdiManager.cpp index 0997f5e41..7504f59c8 100644 --- a/src/kvirc/ui/KviMdiManager.cpp +++ b/src/kvirc/ui/KviMdiManager.cpp @@ -235,45 +235,45 @@ void KviMdiManager::fillWindowPopup() { m_pWindowPopup->clear(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("&Cascade Windows")),this,SLOT(cascadeWindows())); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("Cascade &Maximized")),this,SLOT(cascadeMaximized())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::CascadeWindows)),(__tr2qs("&Cascade Windows")),this,SLOT(cascadeWindows())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::CascadeWindows)),(__tr2qs("Cascade &Maximized")),this,SLOT(cascadeMaximized())); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("&Tile Windows")),this,SLOT(tile())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::TileWindows)),(__tr2qs("&Tile Windows")),this,SLOT(tile())); m_pTileMethodPopup->clear(); - int id = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AUTOTILEWINDOWS)),(__tr2qs("&Auto Tile")),this,SLOT(toggleAutoTile())); + int id = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::AutoTileWindows)),(__tr2qs("&Auto Tile")),this,SLOT(toggleAutoTile())); m_pTileMethodPopup->setItemChecked(id,KVI_OPTION_BOOL(KviOption_boolAutoTileWindows)); m_pTileMethodPopup->setItemParameter(id,-1); m_pTileMethodPopup->insertSeparator(); int ids[KVI_NUM_TILE_METHODS]; - ids[KVI_TILE_METHOD_ANODINE] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Anodine's Full Grid"))); + ids[KVI_TILE_METHOD_ANODINE] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::TileWindows)),(__tr2qs("Anodine's Full Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_ANODINE],KVI_TILE_METHOD_ANODINE); - ids[KVI_TILE_METHOD_PRAGMA4HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 4-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA4HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::TileWindows)),(__tr2qs("Pragma's Horizontal 4-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA4HOR],KVI_TILE_METHOD_PRAGMA4HOR); - ids[KVI_TILE_METHOD_PRAGMA4VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 4-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA4VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::TileWindows)),(__tr2qs("Pragma's Vertical 4-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA4VER],KVI_TILE_METHOD_PRAGMA4VER); - ids[KVI_TILE_METHOD_PRAGMA6HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 6-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA6HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::TileWindows)),(__tr2qs("Pragma's Horizontal 6-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA6HOR],KVI_TILE_METHOD_PRAGMA6HOR); - ids[KVI_TILE_METHOD_PRAGMA6VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 6-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA6VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::TileWindows)),(__tr2qs("Pragma's Vertical 6-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA6VER],KVI_TILE_METHOD_PRAGMA6VER); - ids[KVI_TILE_METHOD_PRAGMA9HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 9-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA9HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::TileWindows)),(__tr2qs("Pragma's Horizontal 9-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA9HOR],KVI_TILE_METHOD_PRAGMA9HOR); - ids[KVI_TILE_METHOD_PRAGMA9VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 9-Grid"))); + ids[KVI_TILE_METHOD_PRAGMA9VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::TileWindows)),(__tr2qs("Pragma's Vertical 9-Grid"))); m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA9VER],KVI_TILE_METHOD_PRAGMA9VER); if(KVI_OPTION_UINT(KviOption_uintTileMethod) >= KVI_NUM_TILE_METHODS)KVI_OPTION_UINT(KviOption_uintTileMethod) = KVI_TILE_METHOD_PRAGMA9HOR; m_pTileMethodPopup->setItemChecked(ids[KVI_OPTION_UINT(KviOption_uintTileMethod)],true); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Tile Met&hod")),m_pTileMethodPopup); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::TileWindows)),(__tr2qs("Tile Met&hod")),m_pTileMethodPopup); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXVERTICAL)),(__tr2qs("Expand &Vertically")),this,SLOT(expandVertical())); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXHORIZONTAL)),(__tr2qs("Expand &Horizontally")),this,SLOT(expandHorizontal())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::MaxVertical)),(__tr2qs("Expand &Vertically")),this,SLOT(expandVertical())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::MaxHorizontal)),(__tr2qs("Expand &Horizontally")),this,SLOT(expandHorizontal())); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),(__tr2qs("Mi&nimize All")),this,SLOT(minimizeAll())); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),(__tr2qs("&Restore all")),this,SLOT(restoreAll())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Minimize)),(__tr2qs("Mi&nimize All")),this,SLOT(minimizeAll())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Restore)),(__tr2qs("&Restore all")),this,SLOT(restoreAll())); m_pWindowPopup->insertSeparator(); int i = 100; diff --git a/src/kvirc/ui/KviMenuBar.cpp b/src/kvirc/ui/KviMenuBar.cpp index 09fac1c93..e0590e1e9 100644 --- a/src/kvirc/ui/KviMenuBar.cpp +++ b/src/kvirc/ui/KviMenuBar.cpp @@ -103,53 +103,53 @@ void KviMenuBar::setupHelpPopup() ACTION_POPUP_ITEM(KVI_COREACTION_HELPINDEX,help) - int id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HELP)),__tr2qs("&Help Browser (Panel)")); + int id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Help)),__tr2qs("&Help Browser (Panel)")); help->setItemParameter(id,KVI_INTERNALCOMMAND_HELP_NEWSTATICWINDOW); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA)),__tr2qs("&Tip of the Day")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Idea)),__tr2qs("&Tip of the Day")); help->setItemParameter(id,KVI_INTERNALCOMMAND_TIP_OPEN); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("About &KVIrc")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::KVIrc)),__tr2qs("About &KVIrc")); help->setItemParameter(id,KVI_INTERNALCOMMAND_ABOUT_ABOUTKVIRC); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Home&page")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::HomePage)),__tr2qs("KVIrc Home&page")); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE); if(kvi_strEqualCIN(KviLocale::localeName(),"ru",2)) { - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Russian Home&page")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::HomePage)),__tr2qs("KVIrc Russian Home&page")); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_RU); } if(kvi_strEqualCIN(KviLocale::localeName(),"fr",2)) { - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc French Home&page")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::HomePage)),__tr2qs("KVIrc French Home&page")); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_FR); } help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),__tr2qs("Subscribe to the Mailing List")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Message)),__tr2qs("Subscribe to the Mailing List")); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_MAILINGLIST); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB)),__tr2qs("Report a Bug / Propose Improvements")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Bomb)),__tr2qs("Report a Bug / Propose Improvements")); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_BUGTRACK); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on Freenode")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)),__tr2qs("Join KVIrc International Channel on Freenode")); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_FREENODE); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on IRCNet")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)),__tr2qs("Join KVIrc International Channel on IRCNet")); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_IRCNET); if(kvi_strEqualCIN(KviLocale::localeName(),"it",2)) { // join #kvirc.net on azzurra - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc Italian Channel on AzzurraNet")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)),__tr2qs("Join KVIrc Italian Channel on AzzurraNet")); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_IT_ON_AZZURRA); } if(kvi_strEqualCIN(KviLocale::localeName(),"fr",2)) { // join #kvirc-fr on freenode - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on Freenode")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)),__tr2qs("Join KVIrc French Channel on Freenode")); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_FR_ON_FREENODE); // join #kvirc on europnet - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on EuropNet")); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Channel)),__tr2qs("Join KVIrc French Channel on EuropNet")); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_FR_ON_EUROPNET); } } @@ -168,7 +168,7 @@ void KviMenuBar::setupSettingsPopup() opt->insertItem(__tr2qs("Toolbars"),m_pToolbarsPopup); - int id = opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_STATUSBAR)),__tr2qs("Show StatusBar"),m_pFrm,SLOT(toggleStatusBar())); + int id = opt->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::StatusBar)),__tr2qs("Show StatusBar"),m_pFrm,SLOT(toggleStatusBar())); opt->setItemChecked(id,m_pFrm->mainStatusBar()); @@ -211,7 +211,7 @@ void KviMenuBar::setupScriptingPopup() ACTION_POPUP_ITEM(KVI_COREACTION_EXECUTEKVS,script) script->insertSeparator(); - script->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TEXTEXCLAMATIVE)),__tr2qs("Restore &Default Script"),g_pApp,SLOT(restoreDefaultScript())); + script->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::TextExclamative)),__tr2qs("Restore &Default Script"),g_pApp,SLOT(restoreDefaultScript())); } void KviMenuBar::setupMainPopup() @@ -223,10 +223,10 @@ void KviMenuBar::setupMainPopup() if(m_pFrm->activeContext()) if(m_pFrm->activeContext()->state()==KviIrcContext::Connected) { - int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs("Disconnect"),m_pFrm,SLOT(executeInternalCommand(int))); + int id = main->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs("Disconnect"),m_pFrm,SLOT(executeInternalCommand(int))); main->setItemParameter(id,KVI_INTERNALCOMMAND_QUIT); } - main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs("New &Connection To"),m_pRecentServersPopup); + main->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::World)),__tr2qs("New &Connection To"),m_pRecentServersPopup); main->insertSeparator(); @@ -234,7 +234,7 @@ void KviMenuBar::setupMainPopup() #ifndef COMPILE_ON_MAC main->insertSeparator(); - main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pFrame,SLOT(close())); + main->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::QuitApp)),__tr2qs("&Quit"),g_pFrame,SLOT(close())); #endif //COMPILE_ON_MAC } @@ -243,7 +243,7 @@ void KviMenuBar::setupRecentServersPopup() KviTalPopupMenu * m = (KviTalPopupMenu *)sender(); g_pApp->fillRecentServersPopup(m); m->insertSeparator(); - m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs("&Other...")); + m->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Server)),__tr2qs("&Other...")); } void KviMenuBar::newConnectionToServer(int id) @@ -300,10 +300,10 @@ void KviMenuBar::setupToolsPopup() ACTION_POPUP_ITEM(KVI_COREACTION_SCREENSHOT,m) // moved the old tools here - m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)),__tr2qs("Show &Icon Table"),g_pIconManager,SLOT(showIconWidget())); + m->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::IconManager)),__tr2qs("Show &Icon Table"),g_pIconManager,SLOT(showIconWidget())); #ifdef COMPILE_KDE_SUPPORT int id; - id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),__tr2qs("Open &Terminal"),m_pFrm,SLOT(executeInternalCommand(int))); + id = m->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Terminal)),__tr2qs("Open &Terminal"),m_pFrm,SLOT(executeInternalCommand(int))); m->setItemParameter(id,KVI_INTERNALCOMMAND_TERM_OPEN); #endif diff --git a/src/kvirc/ui/KviModeEditor.cpp b/src/kvirc/ui/KviModeEditor.cpp index d79ef70e0..5ff68be8a 100644 --- a/src/kvirc/ui/KviModeEditor.cpp +++ b/src/kvirc/ui/KviModeEditor.cpp @@ -65,7 +65,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const QGridLayout *g = new QGridLayout(pBackground); QLabel * l = new QLabel("",pBackground); - l->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MODE))); + l->setPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Mode))); g->addWidget(l,0,0); l = new QLabel(__tr2qs("Channel Modes"),pBackground); diff --git a/src/kvirc/ui/KviOptionsWidget.h b/src/kvirc/ui/KviOptionsWidget.h index 6d015856e..88e0ee0d2 100644 --- a/src/kvirc/ui/KviOptionsWidget.h +++ b/src/kvirc/ui/KviOptionsWidget.h @@ -29,6 +29,7 @@ #include "KviSelectors.h" #include "KviPointerList.h" #include "KviTalGroupBox.h" +#include "KviIconManager.h" #include <QFrame> #include <QLayout> diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp index 3919aae2b..de54a97cb 100644 --- a/src/kvirc/ui/KviQueryWindow.cpp +++ b/src/kvirc/ui/KviQueryWindow.cpp @@ -91,7 +91,8 @@ KviQueryWindow::KviQueryWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConso connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); - m_pListViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Show User List"),buttonContainer(),true,"list_view_button"); + m_pListViewButton = new KviWindowToolPageButton(KviIconManager::HideListView,KviIconManager::ShowListView,__tr2qs("Show User List"),buttonContainer(),true); + m_pListViewButton->setObjectName("list_view_button"); connect(m_pListViewButton,SIGNAL(clicked()),this,SLOT(toggleListView())); #ifdef COMPILE_CRYPT_SUPPORT @@ -549,7 +550,7 @@ void KviQueryWindow::applyOptions() QPixmap * KviQueryWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(isDeadQuery() ? KVI_SMALLICON_DEADQUERY : KVI_SMALLICON_QUERY); + return g_pIconManager->getSmallIcon(isDeadQuery() ? KviIconManager::DeadQuery : KviIconManager::Query); } void KviQueryWindow::resizeEvent(QResizeEvent *) diff --git a/src/kvirc/ui/KviStatusBarApplet.cpp b/src/kvirc/ui/KviStatusBarApplet.cpp index 54c694371..1928d5fad 100644 --- a/src/kvirc/ui/KviStatusBarApplet.cpp +++ b/src/kvirc/ui/KviStatusBarApplet.cpp @@ -130,7 +130,7 @@ KviStatusBarAwayIndicator::KviStatusBarAwayIndicator(KviStatusBar * pParent, Kvi updateDisplay(); if(!pixmap()) - setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY))); + setPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::NotAway))); } KviStatusBarAwayIndicator::~KviStatusBarAwayIndicator() @@ -144,11 +144,11 @@ void KviStatusBarAwayIndicator::updateDisplay() if(c && c->isConnected()) { setPixmap(c->connection()->userInfo()->isAway() ? - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)) : *(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY))); + *(g_pIconManager->getSmallIcon(KviIconManager::Away)) : *(g_pIconManager->getSmallIcon(KviIconManager::NotAway))); } else { // FIXME: We'd like to appear disabled here... but then we // no longer get mouse events :/ - setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY))); + setPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::NotAway))); } } @@ -186,7 +186,7 @@ KviStatusBarApplet * CreateStatusBarAwayIndicator(KviStatusBar * pBar, KviStatus void KviStatusBarAwayIndicator::selfRegister(KviStatusBar * pBar) { KviStatusBarAppletDescriptor * d = new KviStatusBarAppletDescriptor( - __tr2qs("Away Indicator"),"awayindicator",CreateStatusBarAwayIndicator,"",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY))); + __tr2qs("Away Indicator"),"awayindicator",CreateStatusBarAwayIndicator,"",*(g_pIconManager->getSmallIcon(KviIconManager::Away))); pBar->registerAppletDescriptor(d); } @@ -349,7 +349,7 @@ KviStatusBarApplet * CreateStatusBarLagIndicator(KviStatusBar * pBar, KviStatusB void KviStatusBarLagIndicator::selfRegister(KviStatusBar * pBar) { KviStatusBarAppletDescriptor * d = new KviStatusBarAppletDescriptor( - __tr2qs("Lag Indicator"),"lagindicator",CreateStatusBarLagIndicator,"",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVERPING))); + __tr2qs("Lag Indicator"),"lagindicator",CreateStatusBarLagIndicator,"",*(g_pIconManager->getSmallIcon(KviIconManager::ServerPing))); pBar->registerAppletDescriptor(d); } @@ -520,7 +520,7 @@ KviStatusBarApplet * CreateStatusBarClock(KviStatusBar * pBar, KviStatusBarApple void KviStatusBarClock::selfRegister(KviStatusBar * pBar) { KviStatusBarAppletDescriptor * d = new KviStatusBarAppletDescriptor( - __tr2qs("Simple Clock"),"clock",CreateStatusBarClock,"",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME))); + __tr2qs("Simple Clock"),"clock",CreateStatusBarClock,"",*(g_pIconManager->getSmallIcon(KviIconManager::Time))); pBar->registerAppletDescriptor(d); } @@ -601,7 +601,7 @@ KviStatusBarApplet * CreateStatusBarConnectionTimer(KviStatusBar * pBar,KviStatu void KviStatusBarConnectionTimer::selfRegister(KviStatusBar * pBar) { KviStatusBarAppletDescriptor * d = new KviStatusBarAppletDescriptor( - __tr2qs("Connection Timer"),"connectiontimer",CreateStatusBarConnectionTimer,"",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME))); + __tr2qs("Connection Timer"),"connectiontimer",CreateStatusBarConnectionTimer,"",*(g_pIconManager->getSmallIcon(KviIconManager::Time))); pBar->registerAppletDescriptor(d); } @@ -646,7 +646,7 @@ KviStatusBarUpdateIndicator::KviStatusBarUpdateIndicator(KviStatusBar * pParent, updateDisplay(); if(!pixmap()) - setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTUPDATE))); + setPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::NotUpdate))); } KviStatusBarUpdateIndicator::~KviStatusBarUpdateIndicator() @@ -656,9 +656,9 @@ KviStatusBarUpdateIndicator::~KviStatusBarUpdateIndicator() void KviStatusBarUpdateIndicator::updateDisplay() { if(m_bCheckFailed) - setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FAILUPDATE))); + setPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::FailUpdate))); else - setPixmap(m_bUpdateStatus ? *(g_pIconManager->getSmallIcon(KVI_SMALLICON_UPDATE)) : *(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTUPDATE))); + setPixmap(m_bUpdateStatus ? *(g_pIconManager->getSmallIcon(KviIconManager::Update)) : *(g_pIconManager->getSmallIcon(KviIconManager::NotUpdate))); } void KviStatusBarUpdateIndicator::toggleStartup() @@ -709,7 +709,7 @@ KviStatusBarApplet * CreateStatusBarUpdateIndicator(KviStatusBar * pBar, KviStat void KviStatusBarUpdateIndicator::selfRegister(KviStatusBar * pBar) { KviStatusBarAppletDescriptor * d = new KviStatusBarAppletDescriptor( - __tr2qs("Update Indicator"),"updateindicator",CreateStatusBarUpdateIndicator,"",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_UPDATE))); + __tr2qs("Update Indicator"),"updateindicator",CreateStatusBarUpdateIndicator,"",*(g_pIconManager->getSmallIcon(KviIconManager::Update))); pBar->registerAppletDescriptor(d); } diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp index 9551593f0..be47e049e 100644 --- a/src/kvirc/ui/KviTopicWidget.cpp +++ b/src/kvirc/ui/KviTopicWidget.cpp @@ -461,7 +461,7 @@ void KviTopicWidget::switchMode() m_pHistory = new QPushButton(this); m_pHistory->setObjectName("topicw_historybutton"); - m_pHistory->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)))); + m_pHistory->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Time)))); m_pHistory->setGeometry(width() - (height() << 2)+height(),0,height(),height()); KviTalToolTip::add(m_pHistory,__tr2qs("History")); m_pHistory->show(); @@ -469,7 +469,7 @@ void KviTopicWidget::switchMode() m_pAccept = new QPushButton(this); m_pAccept->setObjectName("topicw_acceptbutton"); - m_pAccept->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)))); + m_pAccept->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept)))); m_pAccept->setGeometry(width() - (height() << 1),0,height(),height()); m_pAccept->setEnabled(bCanEdit); m_pAccept->show(); @@ -478,7 +478,7 @@ void KviTopicWidget::switchMode() m_pDiscard = new QPushButton(this); m_pDiscard->setObjectName("topicw_discardbutton"); - m_pDiscard->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)))); + m_pDiscard->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)))); m_pDiscard->setGeometry(width() - height(),0,height(),height()); KviTalToolTip::add(m_pDiscard,__tr2qs("Discard Changes")); m_pDiscard->show(); @@ -497,7 +497,8 @@ void KviTopicWidget::switchMode() void KviTopicWidget::mousePressEvent(QMouseEvent * e) { - if(!(e->button() & Qt::RightButton))return; + if(!(e->button() & Qt::RightButton)) + return; if(!m_pContextPopup) { m_pContextPopup = new KviTalPopupMenu(this); @@ -508,16 +509,19 @@ void KviTopicWidget::mousePressEvent(QMouseEvent * e) void KviTopicWidget::contextPopupAboutToShow() { - if(!m_pContextPopup)return; // hm ? + if(!m_pContextPopup) + return; // hm ? m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs("Copy to clipboard"),this,SLOT(copy())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Copy)),__tr2qs("Copy to clipboard"),this,SLOT(copy())); } void KviTopicWidget::copy() { QClipboard * c = QApplication::clipboard(); - if(!c)return; - if(c->supportsSelection())c->setText(m_szTopic,QClipboard::Selection); + if(!c) + return; + if(c->supportsSelection()) + c->setText(m_szTopic,QClipboard::Selection); c->setText(m_szTopic,QClipboard::Clipboard); } diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp index 16bfd8b9e..3a44cc3c0 100644 --- a/src/kvirc/ui/KviUserListView.cpp +++ b/src/kvirc/ui/KviUserListView.cpp @@ -1883,13 +1883,13 @@ void KviUserListViewArea::paintEvent(QPaintEvent * e) { if(pEntry->globalData()->isIrcOp()) { - QPixmap * pIco = g_pIconManager->getSmallIcon(KVI_SMALLICON_SEXIRCOP); + QPixmap * pIco = g_pIconManager->getSmallIcon(KviIconManager::SexIrcOp); p.drawPixmap(iTheX,iTheY+(m_pListView->m_iFontHeight-11)/2,*pIco); } else if(pEntry->globalData()->gender()!=KviIrcUserEntry::Unknown) { - QPixmap * pIco = g_pIconManager->getSmallIcon((pEntry->globalData()->gender()==KviIrcUserEntry::Male) ? KVI_SMALLICON_SEXMALE : KVI_SMALLICON_SEXFEMALE); + QPixmap * pIco = g_pIconManager->getSmallIcon((pEntry->globalData()->gender()==KviIrcUserEntry::Male) ? KviIconManager::SexMale : KviIconManager::SexFemale); p.drawPixmap(iTheX,iTheY+(m_pListView->m_iFontHeight-11)/2,*pIco); } else if(pEntry->globalData()->isBot()) { - QPixmap * pIco = g_pIconManager->getSmallIcon(KVI_SMALLICON_SEXBOT); + QPixmap * pIco = g_pIconManager->getSmallIcon(KviIconManager::SexBot); p.drawPixmap(iTheX,iTheY+(m_pListView->m_iFontHeight-11)/2,*pIco); } iTheX +=11; @@ -1971,20 +1971,20 @@ void KviUserListViewArea::paintEvent(QPaintEvent * e) pEntry->globalData()->isAway() ? \ ( \ (pEntry->m_iFlags & KviIrcUserEntry::ChanOwner) ? \ - KVI_SMALLICON_CHANOWNERAWAY : ((pEntry->m_iFlags & KviIrcUserEntry::ChanAdmin) ? \ - KVI_SMALLICON_CHANADMINAWAY : ((pEntry->m_iFlags & KviIrcUserEntry::Op) ? \ - KVI_SMALLICON_OPAWAY : ((pEntry->m_iFlags & KviIrcUserEntry::HalfOp) ? \ - KVI_SMALLICON_HALFOPAWAY : ((pEntry->m_iFlags & KviIrcUserEntry::Voice) ? \ - KVI_SMALLICON_VOICEAWAY : KVI_SMALLICON_USEROPAWAY)))) + KviIconManager::ChanOwnerAway : ((pEntry->m_iFlags & KviIrcUserEntry::ChanAdmin) ? \ + KviIconManager::ChanAdminAway : ((pEntry->m_iFlags & KviIrcUserEntry::Op) ? \ + KviIconManager::OpAway : ((pEntry->m_iFlags & KviIrcUserEntry::HalfOp) ? \ + KviIconManager::HalfOpAway : ((pEntry->m_iFlags & KviIrcUserEntry::Voice) ? \ + KviIconManager::VoiceAway : KviIconManager::UserOpAway)))) ) \ : \ ( \ (pEntry->m_iFlags & KviIrcUserEntry::ChanOwner) ? \ - KVI_SMALLICON_CHANOWNER : ((pEntry->m_iFlags & KviIrcUserEntry::ChanAdmin) ? \ - KVI_SMALLICON_CHANADMIN : ((pEntry->m_iFlags & KviIrcUserEntry::Op) ? \ - KVI_SMALLICON_OP : ((pEntry->m_iFlags & KviIrcUserEntry::HalfOp) ? \ - KVI_SMALLICON_HALFOP : ((pEntry->m_iFlags & KviIrcUserEntry::Voice) ? \ - KVI_SMALLICON_VOICE : KVI_SMALLICON_USEROP)))) \ + KviIconManager::ChanOwner : ((pEntry->m_iFlags & KviIrcUserEntry::ChanAdmin) ? \ + KviIconManager::ChanAdmin : ((pEntry->m_iFlags & KviIrcUserEntry::Op) ? \ + KviIconManager::Op : ((pEntry->m_iFlags & KviIrcUserEntry::HalfOp) ? \ + KviIconManager::HalfOp : ((pEntry->m_iFlags & KviIrcUserEntry::Voice) ? \ + KviIconManager::Voice : KviIconManager::UserOp)))) \ ) \ ); p.drawPixmap(iTheX,iTheY+(fm.lineSpacing()-16/*size of small icon*/)/2,*pIco); diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp index 6cad4cebb..1088bfaef 100644 --- a/src/kvirc/ui/KviWindow.cpp +++ b/src/kvirc/ui/KviWindow.cpp @@ -39,7 +39,6 @@ #include "KviWindow.h" #include "KviMainWindow.h" #include "KviWindowListBase.h" -#include "KviIconManager.h" #include "KviMdiChild.h" #include "KviLocale.h" #include "KviIrcView.h" @@ -393,13 +392,13 @@ void KviWindow::destroyWindowListItem() } } -QToolButton * KviWindow::createToolButton(QWidget * par,const char * nam,int pixon,int,const QString & tooltip,bool bOn) +QToolButton * KviWindow::createToolButton(QWidget * pPar, const char * pcName, KviIconManager::SmallIcon eIcon, const QString & szToolTip, bool bOn) { - QToolButton * b = new QToolButton(par); - b->setObjectName(nam); - b->setIcon(QIcon(*(g_pIconManager->getSmallIcon(pixon)))); + QToolButton * b = new QToolButton(pPar); + b->setObjectName(pcName); + b->setIcon(QIcon(*(g_pIconManager->getSmallIcon(eIcon)))); b->setAutoRaise(true); - KviTalToolTip::add(b,tooltip); + KviTalToolTip::add(b,szToolTip); b->setChecked(bOn); return b; } @@ -408,15 +407,17 @@ QToolButton * KviWindow::createToolButton(QWidget * par,const char * nam,int pix void KviWindow::createCryptControllerButton(QWidget *) { #ifdef COMPILE_CRYPT_SUPPORT - m_pCryptControllerButton = new KviWindowToolPageButton(KVI_SMALLICON_UNLOCKEDOFF,KVI_SMALLICON_UNLOCKED,__tr2qs("Crypting"),buttonContainer(),false,"crypt_controller_button"); + m_pCryptControllerButton = new KviWindowToolPageButton(KviIconManager::UnLockedOff,KviIconManager::UnLocked,__tr2qs("Crypting"),buttonContainer(),false); + m_pCryptControllerButton->setObjectName("crypt_controller_button"); connect(m_pCryptControllerButton,SIGNAL(clicked()),this,SLOT(toggleCryptController())); #endif // COMPILE_CRYPT_SUPPORT } void KviWindow::createTextEncodingButton(QWidget * par) { - if(m_pTextEncodingButton)delete m_pTextEncodingButton; - m_pTextEncodingButton = createToolButton(par,"text_encoding_button",KVI_SMALLICON_TEXTENCODING,KVI_SMALLICON_TEXTENCODING,__tr2qs("Text Encoding"),false); + if(m_pTextEncodingButton) + delete m_pTextEncodingButton; + m_pTextEncodingButton = createToolButton(par,"text_encoding_button",KviIconManager::TextEncoding,__tr2qs("Text Encoding"),false); connect(m_pTextEncodingButton,SIGNAL(clicked()),this,SLOT(textEncodingButtonClicked())); } @@ -485,8 +486,8 @@ void KviWindow::setCryptSessionInfo(KviCryptSessionInfo * inf) if(m_pCryptControllerButton) { QIcon is; - is.addPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKEDOFF : KVI_SMALLICON_UNLOCKEDOFF)),QIcon::Normal,QIcon::Off); - is.addPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KVI_SMALLICON_LOCKED : KVI_SMALLICON_UNLOCKED)),QIcon::Normal,QIcon::On); + is.addPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KviIconManager::LockedOff : KviIconManager::UnLockedOff)),QIcon::Normal,QIcon::Off); + is.addPixmap(*(g_pIconManager->getSmallIcon(m_pCryptSessionInfo ? KviIconManager::Locked : KviIconManager::UnLocked)),QIcon::Normal,QIcon::On); m_pCryptControllerButton->setIcon(is); if(m_pCryptControllerButton->isChecked()) @@ -622,7 +623,7 @@ void KviWindow::loadProperties(KviConfigurationFile *cfg) QPixmap * KviWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_DEFAULTICON); + return g_pIconManager->getSmallIcon(KviIconManager::DefaultIcon); } void KviWindow::getWindowListTipText(QString &buffer) diff --git a/src/kvirc/ui/KviWindow.h b/src/kvirc/ui/KviWindow.h index 5621c6e98..5c1d78fa7 100644 --- a/src/kvirc/ui/KviWindow.h +++ b/src/kvirc/ui/KviWindow.h @@ -39,6 +39,7 @@ #include "KviInput.h" #include "KviTalHBox.h" #include "KviTalSplitter.h" +#include "KviIconManager.h" #ifdef COMPILE_ON_WINDOWS // The brain-damaged MSVC compiler can't instantiate QList templates without a destructor definition @@ -358,7 +359,7 @@ protected: void createTextEncodingButton(QWidget * par); void createSystemTextEncodingPopup(); - QToolButton * createToolButton(QWidget * par,const char * nam,int pixon,int pixoff,const QString & tooltip,bool bOn); + QToolButton * createToolButton(QWidget * pPar, const char * pcName, KviIconManager::SmallIcon eIcon, const QString & szToolTip, bool bOn); // This is called by KviInput: actually it links the widgetAdded virtual void childrenTreeChanged(QWidget * widgetAdded); diff --git a/src/kvirc/ui/KviWindowToolWidget.cpp b/src/kvirc/ui/KviWindowToolWidget.cpp index 22e3160fa..96cbb7181 100644 --- a/src/kvirc/ui/KviWindowToolWidget.cpp +++ b/src/kvirc/ui/KviWindowToolWidget.cpp @@ -22,10 +22,7 @@ // //============================================================================= - - #include "KviWindowToolWidget.h" -#include "KviIconManager.h" #include "KviTalVBox.h" #include <QPainter> @@ -35,27 +32,28 @@ #include <QIcon> -KviWindowToolWidget::KviWindowToolWidget(QWidget * parent, KviWindowToolPageButton* button) -:QWidget(parent) +KviWindowToolWidget::KviWindowToolWidget(QWidget * pParent, KviWindowToolPageButton * pButton) +:QWidget(pParent) { - m_pButton=button; - if(m_pButton) m_pButton->setChecked(!isHidden()); + m_pButton = pButton; + if(m_pButton) + m_pButton->setChecked(!isHidden()); } KviWindowToolWidget::~KviWindowToolWidget() { } -KviWindowToolPageButton::KviWindowToolPageButton ( int pixoff,int pixon, const QString & text, QWidget * parent,bool bOn, const char *) -:QToolButton(parent) +KviWindowToolPageButton::KviWindowToolPageButton(KviIconManager::SmallIcon eIconOff, KviIconManager::SmallIcon eIconOn, const QString & szText, QWidget * pParent, bool bOn) +:QToolButton(pParent) { setAutoRaise(true); - setToolTip(text); + setToolTip(szText); setObjectName("kvi_window_tool_button"); QIcon icon; - icon.addPixmap(*(g_pIconManager->getSmallIcon(pixoff)),QIcon::Normal,QIcon::Off); - icon.addPixmap(*(g_pIconManager->getSmallIcon(pixon)),QIcon::Active,QIcon::On); - icon.addPixmap(*(g_pIconManager->getSmallIcon(pixon)),QIcon::Active); + icon.addPixmap(*(g_pIconManager->getSmallIcon(eIconOff)),QIcon::Normal,QIcon::Off); + icon.addPixmap(*(g_pIconManager->getSmallIcon(eIconOn)),QIcon::Active,QIcon::On); + icon.addPixmap(*(g_pIconManager->getSmallIcon(eIconOn)),QIcon::Active); setIcon(icon); setCheckable(true); setChecked(bOn); @@ -64,4 +62,3 @@ KviWindowToolPageButton::KviWindowToolPageButton ( int pixoff,int pixon, const Q KviWindowToolPageButton::~KviWindowToolPageButton() { } - diff --git a/src/kvirc/ui/KviWindowToolWidget.h b/src/kvirc/ui/KviWindowToolWidget.h index 52f4ed23d..aef9ebf2d 100644 --- a/src/kvirc/ui/KviWindowToolWidget.h +++ b/src/kvirc/ui/KviWindowToolWidget.h @@ -26,6 +26,7 @@ //============================================================================= #include "KviHeapObject.h" +#include "KviIconManager.h" #include <QToolButton> @@ -36,17 +37,17 @@ class KVIRC_API KviWindowToolWidget : public QWidget { Q_OBJECT public: - KviWindowToolWidget( QWidget * parent,KviWindowToolPageButton* button); + KviWindowToolWidget(QWidget * pParent, KviWindowToolPageButton * pButton); ~KviWindowToolWidget(); protected: - KviWindowToolPageButton *m_pButton; + KviWindowToolPageButton * m_pButton; }; class KVIRC_API KviWindowToolPageButton : public QToolButton { Q_OBJECT public: - KviWindowToolPageButton ( int pixoff,int pixon, const QString & text, QWidget * parent,bool bOn=0,const char * name = 0 ); + KviWindowToolPageButton(KviIconManager::SmallIcon eIconOff, KviIconManager::SmallIcon eIconOn, const QString & szText, QWidget * pParent, bool bOn = false); ~KviWindowToolPageButton(); }; diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp index c20b762e7..4c1549174 100644 --- a/src/modules/actioneditor/ActionEditor.cpp +++ b/src/modules/actioneditor/ActionEditor.cpp @@ -873,17 +873,17 @@ ActionEditorWindow::ActionEditorWindow(KviMainWindow * lpFrm) QPushButton * btn = new QPushButton(__tr2qs_ctx("OK","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(okClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(btn,1,1); btn = new QPushButton(__tr2qs_ctx("Apply","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(btn,1,2); btn = new QPushButton(__tr2qs_ctx("Cancel","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); g->addWidget(btn,1,3); g->setRowStretch(0,1); @@ -914,7 +914,7 @@ void ActionEditorWindow::cancelClicked() QPixmap * ActionEditorWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_SCRIPTACTION); + return g_pIconManager->getSmallIcon(KviIconManager::ScriptAction); } void ActionEditorWindow::getConfigGroupName(QString &szName) diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp index 83641d90e..4cad53710 100644 --- a/src/modules/addon/AddonFunctions.cpp +++ b/src/modules/addon/AddonFunctions.cpp @@ -193,7 +193,7 @@ namespace AddonFunctions hd.szButton2Text = __tr2qs_ctx("Yes, Proceed","addon"); hd.iDefaultButton = 2; hd.iCancelButton = 1; - hd.pixIcon = *(g_pIconManager->getSmallIcon(KVI_SMALLICON_ADDONS)); + hd.pixIcon = *(g_pIconManager->getSmallIcon(KviIconManager::Addons)); hd.iMinimumWidth = 350; hd.iMinimumHeight = 420; hd.iFlags = KviHtmlDialogData::ForceMinimumSize; diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index d2f4d2ef9..aa7adfb3c 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -91,7 +91,7 @@ AddonManagementDialog::AddonManagementDialog(QWidget * p) { setWindowTitle(__tr2qs_ctx("Manage Script-Based Addons","addon")); setObjectName("Addon manager"); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ADDONS))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Addons))); m_pInstance = this; QGridLayout * g = new QGridLayout(this); diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp index e53272448..a200f2f59 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.cpp +++ b/src/modules/aliaseditor/AliasEditorWindow.cpp @@ -67,8 +67,8 @@ AliasEditorTreeWidgetItem::AliasEditorTreeWidgetItem(QTreeWidget * pTreeWidget,T { setName(szName); m_cPos=0; - if(eType==AliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE)))); - else setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)))); + if(eType==AliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NameSpace)))); + else setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Alias)))); } AliasEditorTreeWidgetItem::AliasEditorTreeWidgetItem(AliasEditorTreeWidgetItem * pParentItem,Type eType,const QString &szName) @@ -77,8 +77,8 @@ AliasEditorTreeWidgetItem::AliasEditorTreeWidgetItem(AliasEditorTreeWidgetItem * setName(szName); m_cPos=0; setFlags(Qt::ItemIsEditable|Qt::ItemIsEnabled|Qt::ItemIsSelectable); - if(eType==AliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE)))); - else setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)))); + if(eType==AliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NameSpace)))); + else setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Alias)))); } void AliasEditorTreeWidgetItem::setName(const QString &szName) @@ -89,8 +89,8 @@ void AliasEditorTreeWidgetItem::setName(const QString &szName) void AliasEditorTreeWidgetItem::setType(Type t) { m_eType=t; - if(t==AliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE)))); - else setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)))); + if(t==AliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NameSpace)))); + else setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Alias)))); } AliasEditorTreeWidget::AliasEditorTreeWidget(QWidget * par) @@ -558,12 +558,12 @@ void AliasEditorWidget::customContextMenuRequested(const QPoint pnt) int id; m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)), + *(g_pIconManager->getSmallIcon(KviIconManager::Alias)), __tr2qs_ctx("Add Alias","editor"), this,SLOT(newAlias())); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)), + *(g_pIconManager->getSmallIcon(KviIconManager::Alias)), __tr2qs_ctx("Add Namespace","editor"), this,SLOT(newNamespace())); @@ -573,7 +573,7 @@ void AliasEditorWidget::customContextMenuRequested(const QPoint pnt) m_pContextPopup->insertSeparator(); id = m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)), + *(g_pIconManager->getSmallIcon(KviIconManager::Quit)), __tr2qs_ctx("Remove Selected","editor"), this,SLOT(removeSelectedItems())); m_pContextPopup->setItemEnabled(id,bHasSelected); @@ -581,20 +581,20 @@ void AliasEditorWidget::customContextMenuRequested(const QPoint pnt) m_pContextPopup->insertSeparator(); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export Selected...","editor"), this,SLOT(exportSelected())); m_pContextPopup->setItemEnabled(id,bHasSelected); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export Selected in singles files...","editor"), this,SLOT(exportSelectedSepFiles())); m_pContextPopup->setItemEnabled(id,bHasSelected); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export All...","editor"), this,SLOT(exportAll())); m_pContextPopup->setItemEnabled(id,bHasItems); @@ -602,13 +602,13 @@ void AliasEditorWidget::customContextMenuRequested(const QPoint pnt) m_pContextPopup->insertSeparator(); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)), + *(g_pIconManager->getSmallIcon(KviIconManager::Search)), __tr2qs_ctx("Find In Aliases...","editor"), this,SLOT(slotFind())); m_pContextPopup->setItemEnabled(id,bHasItems); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE)), + *(g_pIconManager->getSmallIcon(KviIconManager::NameSpace)), __tr2qs_ctx("Collapse All Namespaces","editor"), this,SLOT(slotCollapseNamespaces())); @@ -1187,17 +1187,17 @@ AliasEditorWindow::AliasEditorWindow(KviMainWindow * lpFrm) QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(okClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(btn,1,1); btn = new QPushButton(__tr2qs_ctx("&Apply","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(btn,1,2); btn = new QPushButton(__tr2qs_ctx("Cancel","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); g->addWidget(btn,1,3); g->setRowStretch(0,1); @@ -1228,7 +1228,7 @@ void AliasEditorWindow::cancelClicked() QPixmap * AliasEditorWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS); + return g_pIconManager->getSmallIcon(KviIconManager::Alias); } void AliasEditorWindow::getConfigGroupName(QString &szName) diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp index 91703aeae..00d1d413b 100644 --- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp +++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp @@ -59,7 +59,7 @@ ChannelsJoinDialog::ChannelsJoinDialog(QWidget * par, const char * name) { setObjectName(name); setWindowTitle(__tr2qs("Join Channels")); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Channel))); m_pConsole = 0; @@ -177,7 +177,7 @@ void ChannelsJoinDialog::fillListView() { QTreeWidgetItem * chld = new QTreeWidgetItem(par, RegisteredChannelItem); chld->setText(0,it.key()); - chld->setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL))); + chld->setIcon(0,*(g_pIconManager->getSmallIcon(KviIconManager::Channel))); } } @@ -206,7 +206,7 @@ void ChannelsJoinDialog::fillListView() { chld = new QTreeWidgetItem(par, RecentChannelItem); chld->setText(0,*it); - chld->setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL))); + chld->setIcon(0,*(g_pIconManager->getSmallIcon(KviIconManager::Channel))); } } } @@ -234,7 +234,7 @@ void ChannelsJoinDialog::fillListView() hNoDuplicates.insert(chan.toLower(),1); chld = new QTreeWidgetItem(par, RecentChannelItem); chld->setText(0,chan); - chld->setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL))); + chld->setIcon(0,*(g_pIconManager->getSmallIcon(KviIconManager::Channel))); } } } @@ -256,8 +256,8 @@ void ChannelsJoinDialogTreeWidget::mousePressEvent(QMouseEvent *e) if(!m_pJoinPopup) { m_pJoinPopup = new KviTalPopupMenu(this); - m_pJoinPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_JOIN)),__tr2qs("Join"),pDialog,SLOT(joinClicked())); - m_pJoinPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)),__tr2qs("Delete"),pDialog,SLOT(deleteClicked())); + m_pJoinPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Join)),__tr2qs("Join"),pDialog,SLOT(joinClicked())); + m_pJoinPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),__tr2qs("Delete"),pDialog,SLOT(deleteClicked())); } m_pJoinPopup->popup(QCursor::pos()); diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp index 95ae67111..573f4889c 100644 --- a/src/modules/classeditor/ClassEditorWindow.cpp +++ b/src/modules/classeditor/ClassEditorWindow.cpp @@ -104,9 +104,9 @@ ClassEditorTreeWidgetItem::ClassEditorTreeWidgetItem(QTreeWidget * pTreeWidget, QPixmap * pIcon = 0; if(eType == ClassEditorTreeWidgetItem::Namespace) - pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE); + pIcon = g_pIconManager->getSmallIcon(KviIconManager::NameSpace); else - pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASS); + pIcon = g_pIconManager->getSmallIcon(KviIconManager::Class); setIcon(0,QIcon(*pIcon)); } @@ -123,11 +123,11 @@ ClassEditorTreeWidgetItem::ClassEditorTreeWidgetItem(ClassEditorTreeWidgetItem * QPixmap * pIcon = 0; if(eType == ClassEditorTreeWidgetItem::Namespace) - pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE); + pIcon = g_pIconManager->getSmallIcon(KviIconManager::NameSpace); else if(eType == ClassEditorTreeWidgetItem::Class) - pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASS); + pIcon = g_pIconManager->getSmallIcon(KviIconManager::Class); else - pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_FUNCTION); + pIcon = g_pIconManager->getSmallIcon(KviIconManager::Function); setIcon(0,QIcon(*pIcon)); } @@ -138,9 +138,9 @@ void ClassEditorTreeWidgetItem::setClassNotBuilt(bool bModified) QPixmap * pIcon = 0; if(bModified) - pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASSNOTBUILT); + pIcon = g_pIconManager->getSmallIcon(KviIconManager::ClassNotBuilt); else - pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASS); + pIcon = g_pIconManager->getSmallIcon(KviIconManager::Class); setIcon(0,QIcon(*pIcon)); } @@ -157,11 +157,11 @@ void ClassEditorTreeWidgetItem::setType(Type eType) QPixmap * pIcon = 0; if(eType == ClassEditorTreeWidgetItem::Namespace) - pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE); + pIcon = g_pIconManager->getSmallIcon(KviIconManager::NameSpace); else if(eType == ClassEditorTreeWidgetItem::Class) - pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASS); + pIcon = g_pIconManager->getSmallIcon(KviIconManager::Class); else - pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_FUNCTION); + pIcon = g_pIconManager->getSmallIcon(KviIconManager::Function); setIcon(0,QIcon(*pIcon)); } @@ -881,7 +881,7 @@ void ClassEditorWidget::customContextMenuRequested(QPoint pnt) int iId; iId = m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE)), + *(g_pIconManager->getSmallIcon(KviIconManager::NameSpace)), __tr2qs_ctx("Add Namespace","editor"), this,SLOT(newNamespace())); if(!m_pLastClickedItem) @@ -890,7 +890,7 @@ void ClassEditorWidget::customContextMenuRequested(QPoint pnt) m_pContextPopup->setItemEnabled(iId,m_pLastClickedItem->isNamespace()); iId = m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASS)), + *(g_pIconManager->getSmallIcon(KviIconManager::Class)), __tr2qs_ctx("Add Class","editor"), this,SLOT(newClass())); if(!m_pLastClickedItem) @@ -899,7 +899,7 @@ void ClassEditorWidget::customContextMenuRequested(QPoint pnt) m_pContextPopup->setItemEnabled(iId,m_pLastClickedItem->isNamespace()); iId = m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FUNCTION)), + *(g_pIconManager->getSmallIcon(KviIconManager::Function)), __tr2qs_ctx("Add Member Function","editor"), this,SLOT(newMemberFunction())); if(!m_pLastClickedItem) @@ -913,7 +913,7 @@ void ClassEditorWidget::customContextMenuRequested(QPoint pnt) m_pContextPopup->insertSeparator(); iId = m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)), + *(g_pIconManager->getSmallIcon(KviIconManager::Quit)), __tr2qs_ctx("Remove Selected","editor"), this,SLOT(removeSelectedItems())); m_pContextPopup->setItemEnabled(iId,bHasSelected); @@ -921,20 +921,20 @@ void ClassEditorWidget::customContextMenuRequested(QPoint pnt) m_pContextPopup->insertSeparator(); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export Selected...","editor"), this,SLOT(exportSelected())); m_pContextPopup->setItemEnabled(iId,bHasSelected); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export Selected in singles files...","editor"), this,SLOT(exportSelectedSepFiles())); m_pContextPopup->setItemEnabled(iId,bHasSelected); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export All...","editor"), this,SLOT(exportAll())); m_pContextPopup->setItemEnabled(iId,bHasItems); @@ -942,13 +942,13 @@ void ClassEditorWidget::customContextMenuRequested(QPoint pnt) m_pContextPopup->insertSeparator(); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)), + *(g_pIconManager->getSmallIcon(KviIconManager::Search)), __tr2qs_ctx("Find In Classes...","editor"), this,SLOT(slotFind())); m_pContextPopup->setItemEnabled(iId,bHasItems); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE)), + *(g_pIconManager->getSmallIcon(KviIconManager::NameSpace)), __tr2qs_ctx("Collapse All Items","editor"), this,SLOT(slotCollapseItems())); @@ -1828,17 +1828,17 @@ ClassEditorWindow::ClassEditorWindow(KviMainWindow * pFrm) pLayout->addWidget(m_pEditor,0,0,1,4); QPushButton * pBtn = new QPushButton(__tr2qs_ctx("&Build","editor"),this); - pBtn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + pBtn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); pLayout->addWidget(pBtn,1,1); connect(pBtn,SIGNAL(clicked()),this,SLOT(buildClicked())); pBtn = new QPushButton(__tr2qs_ctx("&Save","editor"),this); - pBtn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + pBtn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); pLayout->addWidget(pBtn,1,2); connect(pBtn,SIGNAL(clicked()),this,SLOT(saveClicked())); pBtn = new QPushButton(__tr2qs_ctx("Close","editor"),this); - pBtn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + pBtn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); pLayout->addWidget(pBtn,1,3); connect(pBtn,SIGNAL(clicked()),this,SLOT(cancelClicked())); @@ -1869,7 +1869,7 @@ void ClassEditorWindow::cancelClicked() QPixmap * ClassEditorWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASSEDITOR); + return g_pIconManager->getSmallIcon(KviIconManager::ClassEditor); } void ClassEditorWindow::configGroupName(QString &szName) diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp index f21a610da..13bcfc60b 100644 --- a/src/modules/codetester/CodeTesterWindow.cpp +++ b/src/modules/codetester/CodeTesterWindow.cpp @@ -96,7 +96,7 @@ CodeTesterWindow::~CodeTesterWindow() QPixmap * CodeTesterWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB); + return g_pIconManager->getSmallIcon(KviIconManager::Bomb); } void CodeTesterWindow::resizeEvent(QResizeEvent *) diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp index c7071b437..9d3641183 100644 --- a/src/modules/dcc/DccChatWindow.cpp +++ b/src/modules/dcc/DccChatWindow.cpp @@ -283,7 +283,7 @@ void DccChatWindow::fillCaptionBuffers() QPixmap * DccChatWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG); + return g_pIconManager->getSmallIcon(KviIconManager::DccMsg); } void DccChatWindow::getBaseLogFileName(QString &buffer) @@ -497,7 +497,7 @@ bool DccChatWindow::event(QEvent *e) if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewDccChatMessages)) { QString szMsg = Qt::escape(QString(d.ptr())); - g_pApp->notifierMessage(this,KVI_SMALLICON_DCCCHATMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); + g_pApp->notifierMessage(this,KviIconManager::DccChatMsg,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); } } } diff --git a/src/modules/dcc/DccDialog.cpp b/src/modules/dcc/DccDialog.cpp index 9cc68b906..e7a429e80 100644 --- a/src/modules/dcc/DccDialog.cpp +++ b/src/modules/dcc/DccDialog.cpp @@ -81,7 +81,7 @@ DccAcceptDialog::DccAcceptDialog(DccBroker * br,DccDescriptor * dcc,const QStrin connect(btn,SIGNAL(clicked()),this,SLOT(rejectClicked())); hb->addWidget(btn); - setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG)))); + setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DccMsg)))); setWindowTitle(capt); l->activateWindow(); @@ -161,7 +161,7 @@ DccRenameDialog::DccRenameDialog(DccBroker * br,DccDescriptor * dcc,const QStrin btn->setDefault(true); //btn->setFocus(); - setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG)))); + setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DccMsg)))); setWindowTitle(__tr2qs_ctx("File Already Exists - KVIrc","dcc")); } diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp index 75989cdd6..4c1149e3e 100644 --- a/src/modules/dcc/DccVideoWindow.cpp +++ b/src/modules/dcc/DccVideoWindow.cpp @@ -655,7 +655,7 @@ void DccVideoWindow::fillCaptionBuffers() QPixmap * DccVideoWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCVOICE); + return g_pIconManager->getSmallIcon(KviIconManager::DccVoice); } void DccVideoWindow::ownMessage(const QString &text, bool bUserFeedback) @@ -863,7 +863,7 @@ bool DccVideoWindow::event(QEvent *e) if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewDccChatMessages)) { QString szMsg = Qt::escape(QString(d.ptr())); - g_pApp->notifierMessage(this,KVI_SMALLICON_DCCCHATMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); + g_pApp->notifierMessage(this,KviIconManager::DccChatMsg,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime)); } } } diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp index b736b4058..d67cc9db2 100644 --- a/src/modules/dcc/DccVoiceWindow.cpp +++ b/src/modules/dcc/DccVoiceWindow.cpp @@ -660,12 +660,12 @@ DccVoiceWindow::DccVoiceWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const cha KviTalVBox * vbox2 = new KviTalVBox(m_pHBox); m_pRecordingLabel = new QLabel(vbox2); - m_pRecordingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RECORD))); + m_pRecordingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Record))); m_pRecordingLabel->setEnabled(false); m_pRecordingLabel->setFrameStyle(QFrame::Raised | QFrame::Panel); m_pPlayingLabel = new QLabel(vbox2); - m_pPlayingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLAY))); + m_pPlayingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KviIconManager::Play))); m_pPlayingLabel->setEnabled(false); m_pPlayingLabel->setFrameStyle(QFrame::Raised | QFrame::Panel); @@ -803,7 +803,7 @@ void DccVoiceWindow::fillCaptionBuffers() QPixmap * DccVoiceWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCVOICE); + return g_pIconManager->getSmallIcon(KviIconManager::DccVoice); } bool DccVoiceWindow::event(QEvent *e) diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index edc0e285f..22d78f7bc 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -223,7 +223,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( { setObjectName("dialog_textinput"); g_pDialogModuleDialogList->append(this); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::KVIrc))); setModal(modal); setWindowTitle(szCaption); diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp index 6bd4bed4a..b01771d58 100644 --- a/src/modules/editor/ScriptEditorImplementation.cpp +++ b/src/modules/editor/ScriptEditorImplementation.cpp @@ -788,7 +788,7 @@ ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par) g->setRowStretch(0,1); QToolButton * b = new QToolButton(this); - b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_OPTIONS))); + b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Options))); b->setObjectName("ToolButtonEditor"); b->setMinimumWidth(24); diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp index f8467e5b1..d01febc7f 100644 --- a/src/modules/eventeditor/EventEditorWindow.cpp +++ b/src/modules/eventeditor/EventEditorWindow.cpp @@ -80,7 +80,7 @@ void EventEditorHandlerTreeWidgetItem::setName(const QString &szName) void EventEditorHandlerTreeWidgetItem::setEnabled(const bool bEnabled) { m_bEnabled = bEnabled; - setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(m_bEnabled ? KVI_SMALLICON_HANDLER : KVI_SMALLICON_HANDLERDISABLED)))); + setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(m_bEnabled ? KviIconManager::Handler : KviIconManager::HandlerDisabled)))); } EventEditor::EventEditor(QWidget * par) @@ -148,7 +148,7 @@ void EventEditor::oneTimeSetup() } } } - it->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(it->childCount() ? KVI_SMALLICON_EVENT : KVI_SMALLICON_EVENTNOHANDLERS)))); + it->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(it->childCount() ? KviIconManager::Event : KviIconManager::EventNoHandlers)))); } connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *))); @@ -213,24 +213,24 @@ void EventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt) QString tmp; if(!(((EventEditorHandlerTreeWidgetItem *)it)->m_bEnabled)) m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Handler)), __tr2qs_ctx("&Enable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled())); else m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)), + *(g_pIconManager->getSmallIcon(KviIconManager::HandlerDisabled)), __tr2qs_ctx("&Disable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled())); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)), + *(g_pIconManager->getSmallIcon(KviIconManager::Quit)), __tr2qs_ctx("Re&move Handler","editor"), this,SLOT(removeCurrentHandler())); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("&Export Handler To...","editor"), this,SLOT(exportCurrentHandler())); } else { m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Handler)), __tr2qs_ctx("&New Handler","editor"), this,SLOT(addHandlerForCurrentEvent())); } @@ -280,7 +280,7 @@ void EventEditor::addHandlerForCurrentEvent() if(it->parent() == 0) { if(it->childCount()==0) - it->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EVENT)))); + it->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Event)))); QString buffer = __tr2qs_ctx("default","editor"); getUniqueHandlerName((EventEditorEventTreeWidgetItem *)it,buffer); @@ -304,7 +304,7 @@ void EventEditor::removeCurrentHandler() if(parent) { if(parent->childCount()==0) - parent->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EVENTNOHANDLERS)))); + parent->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::EventNoHandlers)))); } m_pEditor->setEnabled(false); @@ -524,17 +524,17 @@ EventEditorWindow::EventEditorWindow(KviMainWindow * lpFrm) QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(okClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(btn,1,1); btn = new QPushButton(__tr2qs_ctx("&Apply","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(btn,1,2); btn = new QPushButton(__tr2qs_ctx("Cancel","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); g->addWidget(btn,1,3); g->setRowStretch(0,1); @@ -565,7 +565,7 @@ void EventEditorWindow::cancelClicked() QPixmap * EventEditorWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_EVENT); + return g_pIconManager->getSmallIcon(KviIconManager::Event); } void EventEditorWindow::fillCaptionBuffers() diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index a4bd25cce..b73fef112 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -801,7 +801,7 @@ void FileTransferWindow::getBaseLogFileName(QString &buffer) QPixmap * FileTransferWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_FILETRANSFER); + return g_pIconManager->getSmallIcon(KviIconManager::FileTransfer); } void FileTransferWindow::resizeEvent(QResizeEvent *) diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp index a6cddb5f8..680960929 100644 --- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp +++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp @@ -123,7 +123,7 @@ static bool filetransferwindow_module_init(KviModule * m) __tr2qs("Manage File &Transfers"), filetransferwindow_extension_alloc); - if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FILETRANSFER))); + if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::FileTransfer))); KVSM_REGISTER_SIMPLE_COMMAND(m,"open",filetransferwindow_kvs_cmd_open); diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp index 5f58d85ed..e104b5e95 100644 --- a/src/modules/help/HelpWindow.cpp +++ b/src/modules/help/HelpWindow.cpp @@ -303,7 +303,7 @@ void HelpWindow::searchSelected ( QListWidgetItem *item ) QPixmap * HelpWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_MDIHELP); + return g_pIconManager->getSmallIcon(KviIconManager::MdiHelp); } void HelpWindow::resizeEvent(QResizeEvent *) diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index 133dba96c..85d485128 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -60,7 +60,7 @@ KviIOGraphWindow::~KviIOGraphWindow() QPixmap * KviIOGraphWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYICON); + return g_pIconManager->getSmallIcon(KviIconManager::SayIcon); } void KviIOGraphWindow::resizeEvent(QResizeEvent *) @@ -335,7 +335,7 @@ static bool iograph_module_init(KviModule *m) __tr2qs("Show I/O &Traffic graph"), iograph_extension_alloc); - if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYICON))); + if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::SayIcon))); return true; } diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp index 18127b77b..e9a340ec0 100644 --- a/src/modules/links/LinksWindow.cpp +++ b/src/modules/links/LinksWindow.cpp @@ -60,7 +60,7 @@ LinksWindow::LinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole) m_pRequestButton = new QToolButton(box); m_pRequestButton->setObjectName("request_button"); m_pRequestButton->setIconSize(QSize(16,16)); - m_pRequestButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINKS))); + m_pRequestButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Links))); connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestLinks())); m_pRequestButton->setToolTip(__tr2qs("Request Links")); @@ -140,7 +140,7 @@ void LinksWindow::connectionStateChange() QPixmap * LinksWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_LINKS); + return g_pIconManager->getSmallIcon(KviIconManager::Links); } void LinksWindow::resizeEvent(QResizeEvent *) @@ -363,18 +363,18 @@ void LinksWindow::showHostPopup(QTreeWidgetItem *i,const QPoint &p) if(host.isEmpty())return; m_pHostPopup->clear(); KviCString tmp(KviCString::Format,"LINKS %s *",host.ptr()); - m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINKS)),tmp.ptr()); + m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Links)),tmp.ptr()); m_pHostPopup->insertSeparator(); tmp.sprintf("TIME %s",host.ptr()); - m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),tmp.ptr()); + m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),tmp.ptr()); tmp.sprintf("ADMIN %s",host.ptr()); m_pHostPopup->insertItem(tmp.ptr()); tmp.sprintf("INFO %s",host.ptr()); - m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVERINFO)),tmp.ptr()); + m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::ServerInfo)),tmp.ptr()); tmp.sprintf("MOTD %s",host.ptr()); - m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MOTD)),tmp.ptr()); + m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Motd)),tmp.ptr()); tmp.sprintf("VERSION %s",host.ptr()); - m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),tmp.ptr()); + m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::KVIrc)),tmp.ptr()); tmp.sprintf("TRACE %s",host.ptr()); m_pHostPopup->insertItem(tmp.ptr()); tmp.sprintf("USERS %s",host.ptr()); diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp index 3e596cb3c..3f61f73ac 100644 --- a/src/modules/list/ListWindow.cpp +++ b/src/modules/list/ListWindow.cpp @@ -198,14 +198,14 @@ ListWindow::ListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole) m_pRequestButton = new QToolButton(pBox); m_pRequestButton->setObjectName("request_button"); m_pRequestButton->setIconSize(QSize(16,16)); - m_pRequestButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST)))); + m_pRequestButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::List)))); KviTalToolTip::add(m_pRequestButton,__tr2qs("Request List")); connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestList())); m_pStopListDownloadButton = new QToolButton(pBox); m_pStopListDownloadButton->setObjectName("stoplistdownload_button"); m_pStopListDownloadButton->setIconSize(QSize(16,16)); - m_pStopListDownloadButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICKNAMEPROBLEM)))); + m_pStopListDownloadButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NickNameProblem)))); KviTalToolTip::add(m_pStopListDownloadButton,__tr2qs("Stop list download")); connect(m_pStopListDownloadButton,SIGNAL(clicked()),this,SLOT(stoplistdownload())); @@ -306,7 +306,7 @@ void ListWindow::connectionStateChange() QPixmap * ListWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST); + return g_pIconManager->getSmallIcon(KviIconManager::List); } void ListWindow::resizeEvent(QResizeEvent *) diff --git a/src/modules/logview/LogViewWidget.cpp b/src/modules/logview/LogViewWidget.cpp index 094f22168..303436d08 100644 --- a/src/modules/logview/LogViewWidget.cpp +++ b/src/modules/logview/LogViewWidget.cpp @@ -66,23 +66,23 @@ LogListViewItemType::LogListViewItemType(QTreeWidget * par, LogFile::KviLogTypes switch(m_type) { case LogFile::Channel: - icon= QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)); + icon= QIcon(*g_pIconManager->getSmallIcon(KviIconManager::Channel)); text = __tr2qs_ctx("Channel","logview"); break; case LogFile::Query: - icon= QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_QUERY)); + icon= QIcon(*g_pIconManager->getSmallIcon(KviIconManager::Query)); text = __tr2qs_ctx("Query","logview"); break; case LogFile::DccChat: - icon= QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG)); + icon= QIcon(*g_pIconManager->getSmallIcon(KviIconManager::DccMsg)); text = __tr2qs_ctx("DCC Chat","logview"); break; case LogFile::Console: - icon= QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)); + icon= QIcon(*g_pIconManager->getSmallIcon(KviIconManager::Console)); text = __tr2qs_ctx("Console","logview"); break; default: - icon= QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HELP)); + icon= QIcon(*g_pIconManager->getSmallIcon(KviIconManager::Help)); text = __tr2qs_ctx("Other","logview"); break; } diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index 60a4e4da4..720abb57c 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -207,7 +207,7 @@ void LogViewWindow::applyFilter() QPixmap * LogViewWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_LOG); + return g_pIconManager->getSmallIcon(KviIconManager::Log); } void LogViewWindow::resizeEvent(QResizeEvent *) @@ -386,8 +386,8 @@ void LogViewWindow::rightButtonClicked ( QTreeWidgetItem * it, const QPoint &) KviTalPopupMenu* popup = new KviTalPopupMenu(this); if(((LogListViewItem *)it)->childCount()) - popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove all these channel/query log files","logview"),this,SLOT(deleteCurrent())); - else popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,SLOT(deleteCurrent())); + popup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove all these channel/query log files","logview"),this,SLOT(deleteCurrent())); + else popup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove file","logview"),this,SLOT(deleteCurrent())); popup->exec( QCursor::pos() ); } diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp index 3148da280..7d0af7c04 100644 --- a/src/modules/logview/libkvilogview.cpp +++ b/src/modules/logview/libkvilogview.cpp @@ -135,7 +135,7 @@ static bool logview_module_init(KviModule * m) __tr2qs_ctx("Browse &Log Files","logview"), logview_extension_alloc); - if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LOG))); + if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Log))); return true; } diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp index 07b3f86bb..39b943b93 100644 --- a/src/modules/notifier/NotifierWindow.cpp +++ b/src/modules/notifier/NotifierWindow.cpp @@ -962,20 +962,20 @@ void NotifierWindow::contextPopup(const QPoint & pos) void NotifierWindow::fillContextPopup() { m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITOR)),__tr2qs_ctx("Show/Hide input line","notifier"),this,SLOT(toggleLineEdit())); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr2qs_ctx("Hide","notifier"),this,SLOT(hideNow())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Editor)),__tr2qs_ctx("Show/Hide input line","notifier"),this,SLOT(toggleLineEdit())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Close)),__tr2qs_ctx("Hide","notifier"),this,SLOT(hideNow())); m_pContextPopup->insertSeparator(); m_pDisablePopup->clear(); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Minute","notifier"),this,SLOT(disableFor1Minute())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("5 Minutes","notifier"),this,SLOT(disableFor5Minutes())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("15 Minutes","notifier"),this,SLOT(disableFor15Minutes())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("30 Minutes","notifier"),this,SLOT(disableFor30Minutes())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Hour","notifier"),this,SLOT(disableFor60Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),__tr2qs_ctx("1 Minute","notifier"),this,SLOT(disableFor1Minute())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),__tr2qs_ctx("5 Minutes","notifier"),this,SLOT(disableFor5Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),__tr2qs_ctx("15 Minutes","notifier"),this,SLOT(disableFor15Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),__tr2qs_ctx("30 Minutes","notifier"),this,SLOT(disableFor30Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),__tr2qs_ctx("1 Hour","notifier"),this,SLOT(disableFor60Minutes())); m_pDisablePopup->insertSeparator(); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,SLOT(disableUntilKVIrcRestarted())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,SLOT(disablePermanently())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,SLOT(disableUntilKVIrcRestarted())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,SLOT(disablePermanently())); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup); } void NotifierWindow::disableFor15Minutes() @@ -1114,7 +1114,7 @@ void NotifierWindow::returnPressed() QString szHtml = szTxt; szHtml.replace("<","<"); szHtml.replace(">",">"); - KviCString szTmp(KviCString::Format,"%d",KVI_SMALLICON_OWNPRIVMSG); + KviCString szTmp(KviCString::Format,"%d",KviIconManager::OwnPrivMsg); addMessage(pTab->wnd(),szTmp.ptr(),szHtml,0); m_pLineEdit->setText(""); diff --git a/src/modules/options/OptionsInstanceManager.cpp b/src/modules/options/OptionsInstanceManager.cpp index 449bb73e9..9ec0afff3 100644 --- a/src/modules/options/OptionsInstanceManager.cpp +++ b/src/modules/options/OptionsInstanceManager.cpp @@ -71,7 +71,6 @@ #include "OptionsWidget_windowList.h" #include "KviLocale.h" -#include "KviIconManager.h" #include "OptionsInstanceManager.h" int g_iOptionWidgetInstances = 0; @@ -675,7 +674,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_connection_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_connection; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connection; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connection; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connection e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connection; #else @@ -712,7 +711,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_connectionAdvanced_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_connectionAdvanced; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionAdvanced e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionAdvanced; #else @@ -749,7 +748,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_connectionSsl_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_connectionSsl; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSsl; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSsl; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSsl e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSsl; #else @@ -783,7 +782,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_connectionSocket_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_connectionSocket; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket; #else @@ -817,7 +816,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_identService_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_identService; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identService; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identService; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identService e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identService; #else @@ -851,7 +850,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_proxy_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_proxy; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_proxy; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_proxy; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_proxy e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_proxy; #else @@ -885,7 +884,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_dcc_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_dcc; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dcc; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dcc; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dcc e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dcc; #else @@ -921,7 +920,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_dccGeneral_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_dccGeneral; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral; #else @@ -955,7 +954,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_dccAdvanced_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_dccAdvanced; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced; #else @@ -989,7 +988,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_dccSend_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_dccSend; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSend e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSend; #else @@ -1025,7 +1024,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_dccSendGeneral_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_dccSendGeneral; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendGeneral e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendGeneral; #else @@ -1059,7 +1058,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_dccSendAdvanced_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_dccSendAdvanced; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendAdvanced e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendAdvanced; #else @@ -1093,7 +1092,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_dccChat_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_dccChat; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccChat e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccChat; #else @@ -1127,7 +1126,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_dccVoice_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_dccVoice; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccVoice; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccVoice; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccVoice e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccVoice; #else @@ -1161,7 +1160,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_general_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_general; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_general; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_general; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general; #else @@ -1197,7 +1196,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_mediaTypes_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_mediaTypes; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_mediaTypes; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_mediaTypes; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_mediaTypes e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_mediaTypes; #else @@ -1231,7 +1230,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_sound_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_sound; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sound; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sound; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sound e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sound; #else @@ -1267,7 +1266,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_soundGeneral_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_soundGeneral; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_soundGeneral; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_soundGeneral; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_soundGeneral e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_soundGeneral; #else @@ -1301,7 +1300,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_sounds_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_sounds; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sounds; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sounds; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sounds e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sounds; #else @@ -1335,7 +1334,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_textEncoding_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_textEncoding; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textEncoding; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textEncoding; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textEncoding e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textEncoding; #else @@ -1369,7 +1368,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_uparser_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_uparser; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_uparser e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_uparser; #else @@ -1403,7 +1402,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_urlHandlers_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_urlHandlers; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers; #else @@ -1437,7 +1436,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_identity_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_identity; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity; #else @@ -1473,7 +1472,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classKviIdentityGeneralOptionsWidget_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_KviIdentityGeneralOptionsWidget; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget; #else @@ -1507,7 +1506,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_identityAvatar_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_identityAvatar; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar; #else @@ -1541,7 +1540,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_identityAdvanced_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_identityAdvanced; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced; #else @@ -1575,7 +1574,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_identityProfile_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_identityProfile; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile; #else @@ -1609,7 +1608,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_inputLook_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_inputLook; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputLook; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputLook; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputLook e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputLook; #else @@ -1643,7 +1642,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_interfaceFeatures_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_interfaceFeatures; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_interfaceFeatures; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_interfaceFeatures; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_interfaceFeatures e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_interfaceFeatures; #else @@ -1679,7 +1678,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_inputFeatures_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_inputFeatures; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputFeatures; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputFeatures; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputFeatures e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputFeatures; #else @@ -1713,7 +1712,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_notifier_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_notifier; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifier; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifier; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifier e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifier; #else @@ -1747,7 +1746,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_tray_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_tray; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tray e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tray; #else @@ -1781,7 +1780,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_irc_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_irc; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_irc; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_irc; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_irc e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_irc; #else @@ -1817,7 +1816,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_channel_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_channel; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channel; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channel; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channel e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channel; #else @@ -1853,7 +1852,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_channelGeneral_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_channelGeneral; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelGeneral; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelGeneral; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelGeneral e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelGeneral; #else @@ -1887,7 +1886,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_channelAdvanced_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_channelAdvanced; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelAdvanced e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelAdvanced; #else @@ -1921,7 +1920,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_ircGeneral_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_ircGeneral; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircGeneral; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircGeneral; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircGeneral e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircGeneral; #else @@ -1955,7 +1954,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_ircAdvanced_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_ircAdvanced; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced; #else @@ -1989,7 +1988,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_ircOutput_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_ircOutput; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircOutput; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircOutput; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircOutput e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircOutput; #else @@ -2023,7 +2022,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_protection_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_protection; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection; #else @@ -2059,7 +2058,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_antispam_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_antispam; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_antispam; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_antispam; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_antispam e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_antispam; #else @@ -2093,7 +2092,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_ctcpFloodProtection_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_ctcpFloodProtection; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcpFloodProtection; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcpFloodProtection; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcpFloodProtection e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcpFloodProtection; #else @@ -2127,7 +2126,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_ignore_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_ignore; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ignore; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ignore; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ignore e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ignore; #else @@ -2161,7 +2160,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_query_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_query; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_query; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_query; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_query e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_query; #else @@ -2195,7 +2194,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_tools_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_tools; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools; #else @@ -2231,7 +2230,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_alertsAndHighlighting_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_alertsAndHighlighting; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alertsAndHighlighting e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alertsAndHighlighting; #else @@ -2268,7 +2267,7 @@ OptionsInstanceManager::OptionsInstanceManager() e3->createProc = &classOptionsWidget_highlighting_createInstanceProc; e3->pWidget = 0; e3->szClassName = g_szClassName_OptionsWidget_highlighting; - e3->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting; + e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_highlighting e3->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_highlighting; #else @@ -2302,7 +2301,7 @@ OptionsInstanceManager::OptionsInstanceManager() e3->createProc = &classOptionsWidget_alerts_createInstanceProc; e3->pWidget = 0; e3->szClassName = g_szClassName_OptionsWidget_alerts; - e3->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts; + e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alerts e3->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alerts; #else @@ -2336,7 +2335,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_avatar_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_avatar; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_avatar; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_avatar; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_avatar e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_avatar; #else @@ -2370,7 +2369,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_away_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_away; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_away; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_away; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_away e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_away; #else @@ -2404,7 +2403,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_ctcp_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_ctcp; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcp; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcp; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcp e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcp; #else @@ -2438,7 +2437,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_lag_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_lag; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_lag; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_lag; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_lag e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_lag; #else @@ -2472,7 +2471,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_logging_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_logging; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_logging; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_logging; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_logging e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_logging; #else @@ -2506,7 +2505,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_nickServ_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_nickServ; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_nickServ; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_nickServ; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_nickServ e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_nickServ; #else @@ -2540,7 +2539,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_notify_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_notify; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notify e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notify; #else @@ -2574,7 +2573,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_textIcons_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_textIcons; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textIcons e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textIcons; #else @@ -2608,7 +2607,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_ircViewTheme_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_ircViewTheme; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewTheme; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewTheme; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewTheme e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewTheme; #else @@ -2644,7 +2643,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_ircViewLook_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_ircViewLook; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewLook; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewLook; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewLook e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewLook; #else @@ -2678,7 +2677,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_ircViewFeatures_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_ircViewFeatures; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewFeatures; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewFeatures; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewFeatures e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewFeatures; #else @@ -2712,7 +2711,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_ircViewMarker_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_ircViewMarker; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewMarker; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewMarker; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewMarker e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewMarker; #else @@ -2746,7 +2745,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_message_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_message; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_message e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_message; #else @@ -2782,7 +2781,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_privmsg_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_privmsg; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_privmsg; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_privmsg; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_privmsg e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_privmsg; #else @@ -2816,7 +2815,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_timestamp_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_timestamp; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_timestamp; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_timestamp; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_timestamp e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_timestamp; #else @@ -2850,7 +2849,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_messageColors_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_messageColors; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_messageColors; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_messageColors; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_messageColors e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_messageColors; #else @@ -2884,7 +2883,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_standardColors_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_standardColors; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_standardColors; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_standardColors; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_standardColors e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_standardColors; #else @@ -2918,7 +2917,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_notifierLook_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_notifierLook; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifierLook; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifierLook; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifierLook e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifierLook; #else @@ -2952,7 +2951,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_servers_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_servers; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_servers; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_servers; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_servers e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_servers; #else @@ -2986,7 +2985,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_theme_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_theme; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_theme; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_theme; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_theme e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_theme; #else @@ -3020,7 +3019,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_themeTransparency_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_themeTransparency; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeTransparency; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeTransparency; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeTransparency e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeTransparency; #else @@ -3054,7 +3053,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_themeMdiArea_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_themeMdiArea; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeMdiArea; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeMdiArea; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeMdiArea e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeMdiArea; #else @@ -3088,7 +3087,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_themeToolBarApplets_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_themeToolBarApplets; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeToolBarApplets; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeToolBarApplets; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeToolBarApplets e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeToolBarApplets; #else @@ -3122,7 +3121,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_topicLabel_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_topicLabel; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_topicLabel; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_topicLabel; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_topicLabel e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_topicLabel; #else @@ -3156,7 +3155,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_userList_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_userList; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userList; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userList; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userList e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userList; #else @@ -3192,7 +3191,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_userListBackground_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_userListBackground; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListBackground e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListBackground; #else @@ -3226,7 +3225,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_userListForeground_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_userListForeground; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListForeground; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListForeground; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListForeground e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListForeground; #else @@ -3260,7 +3259,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_userListGrid_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_userListGrid; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListGrid; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListGrid; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListGrid e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListGrid; #else @@ -3294,7 +3293,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_userListFeatures_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_userListFeatures; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListFeatures; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListFeatures; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListFeatures e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListFeatures; #else @@ -3328,7 +3327,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->createProc = &classOptionsWidget_windowList_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_windowList; - e0->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowList; + e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowList; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowList e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowList; #else @@ -3364,7 +3363,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_windowListTree_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_windowListTree; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTree; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTree; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTree e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTree; #else @@ -3400,7 +3399,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_windowListTreeForeground_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_windowListTreeForeground; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeForeground e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeForeground; #else @@ -3434,7 +3433,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_windowListTreeBackground_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_windowListTreeBackground; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeBackground e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeBackground; #else @@ -3468,7 +3467,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->createProc = &classOptionsWidget_windowListTreeFeatures_createInstanceProc; e2->pWidget = 0; e2->szClassName = g_szClassName_OptionsWidget_windowListTreeFeatures; - e2->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeFeatures; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeFeatures; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeFeatures e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeFeatures; #else @@ -3502,7 +3501,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->createProc = &classOptionsWidget_windowListClassic_createInstanceProc; e1->pWidget = 0; e1->szClassName = g_szClassName_OptionsWidget_windowListClassic; - e1->iIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListClassic; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListClassic; #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListClassic e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListClassic; #else @@ -3534,30 +3533,30 @@ OptionsInstanceManager::OptionsInstanceManager() } -void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l) +void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * pList) { - if(l) + if(pList) { - for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) + for(OptionsWidgetInstanceEntry * pEntry = pList->first(); pEntry; pEntry = pList->next()) { - if(e->pWidget) + if(pEntry->pWidget) { - if(e->pWidget->parent()->inherits("OptionsWidgetContainer")) + if(pEntry->pWidget->parent()->inherits("OptionsWidgetContainer")) { - disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); - delete e->pWidget->parent(); - e->pWidget = 0; + disconnect(pEntry->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); + delete pEntry->pWidget->parent(); + pEntry->pWidget = 0; } else { qDebug("Ops...i have deleted the options dialog ?"); } } //else qDebug("Clas %s has no widget",e->szName); - if(e->pChildList)deleteInstanceTree(e->pChildList); + if(pEntry->pChildList) + deleteInstanceTree(pEntry->pChildList); } - delete l; + delete pList; } } - OptionsInstanceManager::~OptionsInstanceManager() { if(m_pInstanceTree) @@ -3572,121 +3571,126 @@ void OptionsInstanceManager::cleanup(KviModule *) void OptionsInstanceManager::widgetDestroyed() { - OptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree); - if(e) - e->pWidget = 0; + OptionsWidgetInstanceEntry * pEntry = findInstanceEntry(sender(),m_pInstanceTree); + if(pEntry) + pEntry->pWidget = 0; if(g_iOptionWidgetInstances > 0) g_iOptionWidgetInstances--; } -KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * e,QWidget * par) +KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * pEntry, QWidget * pPar) { - if(!e) + if(!pEntry) return NULL; #if 0 - if(e->pWidget) + if(pEntry->pWidget) { - if(e->pWidget->parent() != par) + if(pEntry->pWidget->parent() != pPar) { - QWidget * oldPar = (QWidget *)e->pWidget->parent(); - e->pWidget->setParent(par); - oldPar->deleteLater(); - e->pWidget=0; + QWidget * pOldPar = (QWidget *)pEntry->pWidget->parent(); + pEntry->pWidget->setParent(pPar); + pOldPar->deleteLater(); + pEntry->pWidget = 0; } } #endif - if(!(e->pWidget)) + if(!(pEntry->pWidget)) { - e->pWidget = e->createProc(par); + pEntry->pWidget = pEntry->createProc(pPar); g_iOptionWidgetInstances++; - connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); + connect(pEntry->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); } - if(e->pWidget->parent() != par) + if(pEntry->pWidget->parent() != pPar) { - QWidget * oldPar = (QWidget *)e->pWidget->parent(); - e->pWidget->setParent(par); //reparent(par,QPoint(0,0)); - if(oldPar->inherits("OptionsWidgetContainer")) - delete oldPar; + QWidget * pOldPar = (QWidget *)pEntry->pWidget->parent(); + pEntry->pWidget->setParent(pPar); //reparent(pPar,QPoint(0,0)); + if(pOldPar->inherits("OptionsWidgetContainer")) + delete pOldPar; // else it's very likely a QStackedWidget, child of a KviOptionsWidget: don't delete } - if(e->bIsContainer) + if(pEntry->bIsContainer) { // need to create the container structure! - e->pWidget->createTabbedPage(); - if(e->pChildList) + pEntry->pWidget->createTabbedPage(); + if(pEntry->pChildList) { - KviPointerList<OptionsWidgetInstanceEntry> tmp; - tmp.setAutoDelete(false); + KviPointerList<OptionsWidgetInstanceEntry> tmpList; + tmpList.setAutoDelete(false); - for(OptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next()) + for(OptionsWidgetInstanceEntry * pEntry2 = pEntry->pChildList->first(); pEntry2; pEntry2 = pEntry->pChildList->next()) { // add only non containers and widgets not explicitly marked as noncontained - if((!e2->bIsContainer) && (!e2->bIsNotContained)) + if((!pEntry2->bIsContainer) && (!pEntry2->bIsNotContained)) { - OptionsWidgetInstanceEntry * ee = tmp.first(); - int idx = 0; - while(ee) + OptionsWidgetInstanceEntry * pEntry3 = tmpList.first(); + int iIdx = 0; + while(pEntry3) { - if(ee->iPriority >= e2->iPriority)break; - idx++; - ee = tmp.next(); + if(pEntry3->iPriority >= pEntry2->iPriority) + break; + iIdx++; + pEntry3 = tmpList.next(); } - tmp.insert(idx,e2); + tmpList.insert(iIdx,pEntry2); } } - for(OptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev()) + for(OptionsWidgetInstanceEntry * pEntry4 = tmpList.last(); pEntry4; pEntry4 = tmpList.prev()) { - KviOptionsWidget * ow = getInstance(e3,e->pWidget->tabWidget()); - e->pWidget->addOptionsWidget(e3->szName,*(g_pIconManager->getSmallIcon(e3->iIcon)),ow); + KviOptionsWidget * pOpt = getInstance(pEntry4,pEntry->pWidget->tabWidget()); + pEntry->pWidget->addOptionsWidget(pEntry4->szName,*(g_pIconManager->getSmallIcon(pEntry4->eIcon)),pOpt); } } } - return e->pWidget; + return pEntry->pWidget; } -OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l) +OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QObject * pObj, KviPointerList<OptionsWidgetInstanceEntry> * pList) { - if(l) + if(pList) { - for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) + for(OptionsWidgetInstanceEntry * pEntry = pList->first(); pEntry; pEntry = pList->next()) { - if(ptr == e->pWidget)return e; - if(e->pChildList) + if(pObj == pEntry->pWidget) + return pEntry; + if(pEntry->pChildList) { - OptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList); - if(e2)return e2; + OptionsWidgetInstanceEntry * pEntry2 = findInstanceEntry(pObj,pEntry->pChildList); + if(pEntry2) + return pEntry2; } } } return 0; } -OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l) +OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName, KviPointerList<OptionsWidgetInstanceEntry> * pList) { - if(l) + if(pList) { - for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) + for(OptionsWidgetInstanceEntry * pEntry = pList->first(); pEntry; pEntry = pList->next()) { - if(kvi_strEqualCI(e->szClassName,clName))return e; - if(e->pChildList) + if(kvi_strEqualCI(pEntry->szClassName,pcName)) + return pEntry; + if(pEntry->pChildList) { - OptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList); - if(e2)return e2; + OptionsWidgetInstanceEntry * pEntry2 = findInstanceEntry(pcName,pEntry->pChildList); + if(pEntry2) + return pEntry2; } } } return 0; } -OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName) +OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName) { - return findInstanceEntry(clName,m_pInstanceTree); + return findInstanceEntry(pcName,m_pInstanceTree); } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsInstanceManager.h b/src/modules/options/OptionsInstanceManager.h index f96cde844..2c9525ac0 100644 --- a/src/modules/options/OptionsInstanceManager.h +++ b/src/modules/options/OptionsInstanceManager.h @@ -37,26 +37,27 @@ #include "KviModule.h" #include "KviPointerList.h" #include "KviQString.h" +#include "KviIconManager.h" typedef struct _OptionsWidgetInstanceEntry OptionsWidgetInstanceEntry; typedef struct _OptionsWidgetInstanceEntry { - KviOptionsWidget * (*createProc)(QWidget *); - KviOptionsWidget * pWidget; // singleton - int iIcon; - QString szName; - QString szNameNoLocale; - const char * szClassName; - int iPriority; - QString szKeywords; - QString szKeywordsNoLocale; - QString szGroup; - bool bIsContainer; - bool bIsNotContained; + KviOptionsWidget * (*createProc)(QWidget *); + KviOptionsWidget * pWidget; // singleton + KviIconManager::SmallIcon eIcon; + QString szName; + QString szNameNoLocale; + const char * szClassName; + int iPriority; + QString szKeywords; + QString szKeywordsNoLocale; + QString szGroup; + bool bIsContainer; + bool bIsNotContained; KviPointerList<OptionsWidgetInstanceEntry> * pChildList; - bool bDoInsert; // a helper for OptionsDialog::fillListView() + bool bDoInsert; // a helper for OptionsDialog::fillListView() } OptionsWidgetInstanceEntry; @@ -67,16 +68,16 @@ public: OptionsInstanceManager(); virtual ~OptionsInstanceManager(); protected: - KviPointerList<OptionsWidgetInstanceEntry> * m_pInstanceTree; + KviPointerList<OptionsWidgetInstanceEntry> * m_pInstanceTree; public: KviPointerList<OptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; }; - KviOptionsWidget * getInstance(OptionsWidgetInstanceEntry * e,QWidget * par); - OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName); - void cleanup(KviModule * m); + KviOptionsWidget * getInstance(OptionsWidgetInstanceEntry * pEntry, QWidget * pPar); + OptionsWidgetInstanceEntry * findInstanceEntry(const char * pcName); + void cleanup(KviModule *); protected: - OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l); - OptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l); - void deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l); + OptionsWidgetInstanceEntry * findInstanceEntry(const char * pcName, KviPointerList<OptionsWidgetInstanceEntry> * pList); + OptionsWidgetInstanceEntry * findInstanceEntry(const QObject * pObj, KviPointerList<OptionsWidgetInstanceEntry> * pList); + void deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * pList); protected slots: void widgetDestroyed(); }; diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp index edb61873c..53e8e6e87 100644 --- a/src/modules/options/OptionsWidgetContainer.cpp +++ b/src/modules/options/OptionsWidgetContainer.cpp @@ -103,13 +103,13 @@ void OptionsWidgetContainer::setup(KviOptionsWidget * w) m_pLayout->addWidget(b,1,1); b->setDefault(true); connect(b,SIGNAL(clicked()),this,SLOT(okClicked())); - b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); m_pCancel = new QPushButton(__tr2qs_ctx("Cancel","options"),this); KviTalToolTip::add(m_pCancel,__tr2qs_ctx("Close this dialog, discarding all changes.","options")); m_pLayout->addWidget(m_pCancel,1,2); connect(m_pCancel,SIGNAL(clicked()),this,SLOT(cancelClicked())); - m_pCancel->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + m_pCancel->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); m_pLayout->setRowStretch(0,1); @@ -118,7 +118,7 @@ void OptionsWidgetContainer::setup(KviOptionsWidget * w) OptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->metaObject()->className()); if(e) { - setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(e->iIcon)))); + setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(e->eIcon)))); setWindowTitle(e->szName); } diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.h b/src/modules/options/OptionsWidget_alertsAndHighlighting.h index eba3acea9..2d72f1f27 100644 --- a/src/modules/options/OptionsWidget_alertsAndHighlighting.h +++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.h @@ -29,7 +29,7 @@ class QRadioButton; class QLineEdit; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting KVI_SMALLICON_RAW +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting KviIconManager::Raw #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alertsAndHighlighting __tr2qs_no_lookup("Alert/Highlight") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_alertsAndHighlighting OptionsWidget_tools #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_alertsAndHighlighting true @@ -43,7 +43,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting KVI_SMALLICON_RAW +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting KviIconManager::Raw #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_highlighting __tr2qs_no_lookup("Highlight") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_highlighting OptionsWidget_alertsAndHighlighting @@ -64,7 +64,7 @@ protected: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts KVI_SMALLICON_RAW +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts KviIconManager::Raw #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alerts __tr2qs_no_lookup("Window List Alert") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_alerts OptionsWidget_alertsAndHighlighting diff --git a/src/modules/options/OptionsWidget_antiSpam.h b/src/modules/options/OptionsWidget_antiSpam.h index 9ca9e11e4..71edd3288 100644 --- a/src/modules/options/OptionsWidget_antiSpam.h +++ b/src/modules/options/OptionsWidget_antiSpam.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_antispam KVI_SMALLICON_SPAM +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_antispam KviIconManager::Spam #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_antispam __tr2qs_no_lookup("Anti-spam") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_antispam OptionsWidget_protection diff --git a/src/modules/options/OptionsWidget_avatar.h b/src/modules/options/OptionsWidget_avatar.h index eab658918..821cd7637 100644 --- a/src/modules/options/OptionsWidget_avatar.h +++ b/src/modules/options/OptionsWidget_avatar.h @@ -28,7 +28,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_avatar KVI_SMALLICON_AVATAR +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_avatar KviIconManager::Avatar #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_avatar __tr2qs_no_lookup("Avatars") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_avatar OptionsWidget_tools #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_avatar 9 diff --git a/src/modules/options/OptionsWidget_away.h b/src/modules/options/OptionsWidget_away.h index 79bf17d04..45eb84821 100644 --- a/src/modules/options/OptionsWidget_away.h +++ b/src/modules/options/OptionsWidget_away.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_away KVI_SMALLICON_AWAY +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_away KviIconManager::Away #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_away __tr2qs_no_lookup("Away") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_away OptionsWidget_tools diff --git a/src/modules/options/OptionsWidget_channel.h b/src/modules/options/OptionsWidget_channel.h index 5480db36b..e02bb367a 100644 --- a/src/modules/options/OptionsWidget_channel.h +++ b/src/modules/options/OptionsWidget_channel.h @@ -32,7 +32,7 @@ class QComboBox; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channel KVI_SMALLICON_CHANNEL +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channel KviIconManager::Channel #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channel __tr2qs_no_lookup("Channel") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_channel OptionsWidget_irc #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channel true @@ -48,7 +48,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelGeneral KVI_SMALLICON_CHANNEL +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelGeneral KviIconManager::Channel #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelGeneral __tr2qs_no_lookup("General") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_channelGeneral OptionsWidget_channel @@ -60,7 +60,7 @@ public: ~OptionsWidget_channelGeneral(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced KVI_SMALLICON_CHANNEL +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced KviIconManager::Channel #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelAdvanced __tr2qs_no_lookup("Advanced") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_channelAdvanced OptionsWidget_channel diff --git a/src/modules/options/OptionsWidget_connection.h b/src/modules/options/OptionsWidget_connection.h index 967905943..8cca4c325 100644 --- a/src/modules/options/OptionsWidget_connection.h +++ b/src/modules/options/OptionsWidget_connection.h @@ -25,10 +25,11 @@ //============================================================================= #include "KviOptionsWidget.h" +#include "KviIconManager.h" class QRadioButton; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connection KVI_SMALLICON_WORLD +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connection KviIconManager::World #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connection __tr2qs_no_lookup("Connection") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connection 98000 @@ -41,7 +42,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced KVI_SMALLICON_WORLD +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced KviIconManager::World #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionAdvanced __tr2qs_no_lookup("Advanced") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_connectionAdvanced OptionsWidget_connection #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionAdvanced true @@ -55,7 +56,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSsl KVI_SMALLICON_SSL +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSsl KviIconManager::Ssl #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSsl __tr2qs_no_lookup("SSL") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_connectionSsl OptionsWidget_connectionAdvanced #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSsl 30 @@ -72,7 +73,7 @@ public: -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket KVI_SMALLICON_SOCKETERROR +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket KviIconManager::SocketError #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSocket __tr2qs_no_lookup("Socket") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_connectionSocket OptionsWidget_connectionAdvanced #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket 20 @@ -87,7 +88,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identService KVI_SMALLICON_IDENT +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identService KviIconManager::Ident #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identService __tr2qs_no_lookup("Ident Service") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_identService OptionsWidget_connectionAdvanced #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identService 10 diff --git a/src/modules/options/OptionsWidget_ctcp.h b/src/modules/options/OptionsWidget_ctcp.h index 9733267ea..135dc03f5 100644 --- a/src/modules/options/OptionsWidget_ctcp.h +++ b/src/modules/options/OptionsWidget_ctcp.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcp KVI_SMALLICON_CTCPREQUESTREPLIED +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcp KviIconManager::CtcpRequestReplied #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ctcp __tr2qs_no_lookup("CTCP") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_ctcp OptionsWidget_tools #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcp 70000 diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.h b/src/modules/options/OptionsWidget_ctcpFloodProtection.h index f5acc5375..300d0d8b3 100644 --- a/src/modules/options/OptionsWidget_ctcpFloodProtection.h +++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcpFloodProtection KVI_SMALLICON_CTCPREQUESTFLOOD +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcpFloodProtection KviIconManager::CtcpRequestFlood #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ctcpFloodProtection __tr2qs_no_lookup("Flood Protection") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_ctcpFloodProtection OptionsWidget_protection diff --git a/src/modules/options/OptionsWidget_dcc.h b/src/modules/options/OptionsWidget_dcc.h index b6b5a1ecb..90f70733d 100644 --- a/src/modules/options/OptionsWidget_dcc.h +++ b/src/modules/options/OptionsWidget_dcc.h @@ -25,8 +25,9 @@ //============================================================================= #include "KviOptionsWidget.h" +#include "KviIconManager.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dcc KVI_SMALLICON_DCCERROR +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dcc KviIconManager::DccError #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dcc __tr2qs_no_lookup("DCC") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dcc 70000 #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dcc true @@ -41,7 +42,7 @@ public: -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral KVI_SMALLICON_DCCERROR +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral KviIconManager::DccError #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccGeneral __tr2qs_no_lookup("General") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral 70000 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccGeneral OptionsWidget_dcc @@ -54,7 +55,7 @@ public: ~OptionsWidget_dccGeneral(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced KVI_SMALLICON_DCCERROR +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced KviIconManager::DccError #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccAdvanced __tr2qs_no_lookup("Advanced") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced 70000 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccAdvanced OptionsWidget_dcc @@ -70,7 +71,7 @@ public: -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend KVI_SMALLICON_DCCMSG +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend KviIconManager::DccMsg #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSend __tr2qs_no_lookup("File Transfer") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccSend OptionsWidget_dcc #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSend true @@ -84,7 +85,7 @@ public: ~OptionsWidget_dccSend(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral KVI_SMALLICON_DCCMSG +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral KviIconManager::DccMsg #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendGeneral __tr2qs_no_lookup("General") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccSendGeneral OptionsWidget_dccSend @@ -98,7 +99,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced KVI_SMALLICON_DCCMSG +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced KviIconManager::DccMsg #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendAdvanced __tr2qs_no_lookup("Advanced") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccSendAdvanced OptionsWidget_dccSend @@ -111,7 +112,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat KVI_SMALLICON_DCCREQUEST +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat KviIconManager::DccRequest #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccChat __tr2qs_no_lookup("Chat") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccChat OptionsWidget_dcc #define KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccChat true @@ -124,7 +125,7 @@ public: ~OptionsWidget_dccChat(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccVoice KVI_SMALLICON_DCCVOICE +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccVoice KviIconManager::DccVoice #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccVoice __tr2qs_no_lookup("Voice") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccVoice OptionsWidget_dcc #define KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccVoice true diff --git a/src/modules/options/OptionsWidget_general.h b/src/modules/options/OptionsWidget_general.h index a883461b5..88c20335b 100644 --- a/src/modules/options/OptionsWidget_general.h +++ b/src/modules/options/OptionsWidget_general.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_general KVI_SMALLICON_OPTIONS +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_general KviIconManager::Options #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_general __tr2qs_no_lookup("General options") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general 40000 diff --git a/src/modules/options/OptionsWidget_identity.h b/src/modules/options/OptionsWidget_identity.h index 2fcf0bd86..a412686af 100644 --- a/src/modules/options/OptionsWidget_identity.h +++ b/src/modules/options/OptionsWidget_identity.h @@ -133,7 +133,7 @@ protected slots: -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity KVI_SMALLICON_WHO +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity KviIconManager::Who #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identity __tr2qs_no_lookup("Identity") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity 99998 #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identity true @@ -149,7 +149,7 @@ public: -#define KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget KVI_SMALLICON_WHO +#define KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget KviIconManager::Who #define KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget __tr2qs_no_lookup("General") #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget 90000 #define KVI_OPTIONS_WIDGET_PARENT_KviIdentityGeneralOptionsWidget OptionsWidget_identity @@ -173,7 +173,7 @@ protected: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar KVI_SMALLICON_AVATAR +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar KviIconManager::Avatar #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAvatar __tr2qs_no_lookup("Avatar") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar 80000 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_identityAvatar OptionsWidget_identity @@ -198,7 +198,7 @@ protected: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced KVI_SMALLICON_SPY +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced KviIconManager::Spy #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAdvanced __tr2qs_no_lookup("Advanced") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced 70000 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_identityAdvanced OptionsWidget_identity @@ -223,7 +223,7 @@ protected: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile KVI_SMALLICON_REGUSERS +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile KviIconManager::RegUsers #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityProfile __tr2qs_no_lookup("Profiles") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile 60000 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_identityProfile OptionsWidget_identity diff --git a/src/modules/options/OptionsWidget_ignore.h b/src/modules/options/OptionsWidget_ignore.h index 88194f1fb..4754f2b53 100644 --- a/src/modules/options/OptionsWidget_ignore.h +++ b/src/modules/options/OptionsWidget_ignore.h @@ -28,7 +28,7 @@ #include "KviOptionsWidget.h" #include "KviSelectors.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ignore KVI_SMALLICON_IGNORE +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ignore KviIconManager::Ignore #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ignore __tr2qs_no_lookup("Ignore") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_ignore OptionsWidget_protection #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ignore __tr2qs_no_lookup("protection") diff --git a/src/modules/options/OptionsWidget_input.h b/src/modules/options/OptionsWidget_input.h index 04769d928..bcf8c7dbf 100644 --- a/src/modules/options/OptionsWidget_input.h +++ b/src/modules/options/OptionsWidget_input.h @@ -29,7 +29,7 @@ #include <QComboBox> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputLook KVI_SMALLICON_INPUT +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputLook KviIconManager::Input #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputLook __tr2qs_no_lookup("Input") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputLook __tr2qs_no_lookup("theme,colors,text") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_inputLook "theme" @@ -47,7 +47,7 @@ public: virtual void commit(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputFeatures KVI_SMALLICON_INPUT +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputFeatures KviIconManager::Input #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputFeatures __tr2qs_no_lookup("Input") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_inputFeatures OptionsWidget_interfaceFeatures diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.h b/src/modules/options/OptionsWidget_interfaceFeatures.h index 69b000b7a..166b8977f 100644 --- a/src/modules/options/OptionsWidget_interfaceFeatures.h +++ b/src/modules/options/OptionsWidget_interfaceFeatures.h @@ -26,9 +26,10 @@ //============================================================================= #include "KviOptionsWidget.h" + #include <QCheckBox> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_interfaceFeatures KVI_SMALLICON_IDEA +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_interfaceFeatures KviIconManager::Idea #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_interfaceFeatures __tr2qs_no_lookup("Interface") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_interfaceFeatures 50000 diff --git a/src/modules/options/OptionsWidget_irc.h b/src/modules/options/OptionsWidget_irc.h index fe24ad621..3dde1b0ee 100644 --- a/src/modules/options/OptionsWidget_irc.h +++ b/src/modules/options/OptionsWidget_irc.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_irc KVI_SMALLICON_IRC +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_irc KviIconManager::Irc #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_irc __tr2qs_no_lookup("IRC") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_irc 80000 #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_irc true @@ -39,7 +39,7 @@ public: ~OptionsWidget_irc(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircGeneral KVI_SMALLICON_IRC +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircGeneral KviIconManager::Irc #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircGeneral __tr2qs_no_lookup("General") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_ircGeneral OptionsWidget_irc #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircGeneral 80000 @@ -53,7 +53,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced KVI_SMALLICON_IRC +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced KviIconManager::Irc #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircAdvanced __tr2qs_no_lookup("Advanced") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_ircAdvanced OptionsWidget_irc #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced 50000 diff --git a/src/modules/options/OptionsWidget_ircOutput.h b/src/modules/options/OptionsWidget_ircOutput.h index 636d25e64..ee5775323 100644 --- a/src/modules/options/OptionsWidget_ircOutput.h +++ b/src/modules/options/OptionsWidget_ircOutput.h @@ -29,7 +29,7 @@ class QComboBox; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircOutput KVI_SMALLICON_RAW +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircOutput KviIconManager::Raw #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircOutput __tr2qs_no_lookup("Verbosity And Output") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_ircOutput OptionsWidget_irc #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircOutput __tr2qs_no_lookup("debug") diff --git a/src/modules/options/OptionsWidget_ircView.h b/src/modules/options/OptionsWidget_ircView.h index a5a10c920..1514ddcf0 100644 --- a/src/modules/options/OptionsWidget_ircView.h +++ b/src/modules/options/OptionsWidget_ircView.h @@ -32,7 +32,7 @@ #include <QComboBox> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewTheme KVI_SMALLICON_IRCVIEW +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewTheme KviIconManager::IrcView #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewTheme __tr2qs_no_lookup("Output") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewTheme __tr2qs_no_lookup("theme,colors,output") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewTheme "theme" @@ -46,7 +46,7 @@ public: ~OptionsWidget_ircViewTheme(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewLook KVI_SMALLICON_IRCVIEW +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewLook KviIconManager::IrcView #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewLook __tr2qs_no_lookup("Look") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewLook __tr2qs_no_lookup("theme,colors,output") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewLook "theme" @@ -66,7 +66,7 @@ public: virtual void commit(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewFeatures KVI_SMALLICON_IRCVIEW +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewFeatures KviIconManager::IrcView #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewFeatures __tr2qs_no_lookup("Features") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewFeatures "theme" #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_ircViewFeatures OptionsWidget_ircViewTheme @@ -80,7 +80,7 @@ public: ~OptionsWidget_ircViewFeatures(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewMarker KVI_SMALLICON_IRCVIEW +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewMarker KviIconManager::IrcView #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewMarker __tr2qs_no_lookup("Marker") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewMarker "theme" #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_ircViewMarker OptionsWidget_ircViewTheme diff --git a/src/modules/options/OptionsWidget_lag.h b/src/modules/options/OptionsWidget_lag.h index 3600ce675..3cbe70597 100644 --- a/src/modules/options/OptionsWidget_lag.h +++ b/src/modules/options/OptionsWidget_lag.h @@ -27,7 +27,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_lag KVI_SMALLICON_STATS +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_lag KviIconManager::Stats #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_lag __tr2qs_no_lookup("Lag") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_lag OptionsWidget_tools #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_lag __tr2qs_no_lookup("time,ping") diff --git a/src/modules/options/OptionsWidget_logging.h b/src/modules/options/OptionsWidget_logging.h index 5c864d975..bcf345f36 100644 --- a/src/modules/options/OptionsWidget_logging.h +++ b/src/modules/options/OptionsWidget_logging.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_logging KVI_SMALLICON_LOG +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_logging KviIconManager::Log #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_logging __tr2qs_no_lookup("Logging") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_logging __tr2qs_no_lookup("save,output") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_logging OptionsWidget_tools diff --git a/src/modules/options/OptionsWidget_mediaTypes.h b/src/modules/options/OptionsWidget_mediaTypes.h index 2b7c651ec..25f1bbe9a 100644 --- a/src/modules/options/OptionsWidget_mediaTypes.h +++ b/src/modules/options/OptionsWidget_mediaTypes.h @@ -26,8 +26,8 @@ #include "KviOptionsWidget.h" #include "KviMediaManager.h" -#include <QTreeWidget> +#include <QTreeWidget> #include <QLineEdit> #include <QPushButton> @@ -44,7 +44,7 @@ public: const KviMediaType * mydata(){ return &m_data; }; }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_mediaTypes KVI_SMALLICON_FILE +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_mediaTypes KviIconManager::File #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_mediaTypes __tr2qs_no_lookup("Media Types") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_mediaTypes OptionsWidget_general #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_mediaTypes __tr2qs_no_lookup("file,audio,video,programs") diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp index 6dd563142..4470be721 100644 --- a/src/modules/options/OptionsWidget_message.cpp +++ b/src/modules/options/OptionsWidget_message.cpp @@ -30,7 +30,6 @@ #include "KviOptions.h" #include "KviApplication.h" #include "KviLocale.h" -#include "KviIconManager.h" #include "KviMircCntrl.h" #include "KviConfigurationFile.h" #include "KviFileDialog.h" @@ -449,18 +448,20 @@ OptionsWidget_messageColors::~OptionsWidget_messageColors() delete m_pIconPopup; } -void OptionsWidget_messageColors::newIconSelected(int iconId) +void OptionsWidget_messageColors::newIconSelected(KviIconManager::SmallIcon eIcon) { if(!m_pLastItem)return; - if(iconId >= KVI_NUM_SMALL_ICONS)return; - m_pLastItem->msgType()->setPixId(iconId); - m_pIconButton->setIcon(*(g_pIconManager->getSmallIcon(iconId))); + if(eIcon >= KviIconManager::IconCount) + return; + m_pLastItem->msgType()->setPixId(eIcon); + m_pIconButton->setIcon(*(g_pIconManager->getSmallIcon(eIcon))); m_pListView->repaint(m_pListView->visualItemRect(m_pLastItem)); } void OptionsWidget_messageColors::saveLastItem() { - if(!m_pLastItem)return; + if(!m_pLastItem) + return; int curIt = m_pForeListWidget->currentRow(); if(curIt >= 0) //quite useless @@ -625,17 +626,20 @@ void OptionsWidget_messageColors::load() tmp.sprintf("Fore%d",it->optionId()); int fore = cfg.readIntEntry(tmp,it->msgType()->fore()); - if(fore < 0 || fore > 15)fore = 0; + if(fore < 0 || fore > 15) + fore = 0; it->msgType()->setFore(fore); tmp.sprintf("Back%d",it->optionId()); int back = cfg.readIntEntry(tmp,it->msgType()->back()); - if(back < 0 || back > 15)back = KviMircCntrl::Transparent; + if(back < 0 || back > 15) + back = KviMircCntrl::Transparent; it->msgType()->setBack(back); tmp.sprintf("Icon%d",it->optionId()); int ico = cfg.readIntEntry(tmp,it->msgType()->pixId()); - if(ico < 0 || ico >= KVI_NUM_SMALL_ICONS)ico = 0; + if(ico < 0 || ico >= KviIconManager::IconCount) + ico = 0; it->msgType()->setPixId(ico); tmp.sprintf("Log%d",it->optionId()); diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h index d9ac01ad5..c9e1bdee5 100644 --- a/src/modules/options/OptionsWidget_message.h +++ b/src/modules/options/OptionsWidget_message.h @@ -27,6 +27,7 @@ #include "KviOptionsWidget.h" #include "KviMessageTypeSettings.h" #include "KviTalPopupMenu.h" +#include "KviIconManager.h" #include <QTreeWidget> #include <QItemDelegate> @@ -35,7 +36,7 @@ #include <QPainter> #include <QColorGroup> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message KVI_SMALLICON_MESSAGES +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message KviIconManager::Messages #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_message __tr2qs_no_lookup("Text") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_message __tr2qs_no_lookup("theme,colors,output") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_message "theme" @@ -50,7 +51,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_privmsg KVI_SMALLICON_RAW +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_privmsg KviIconManager::Raw #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_privmsg __tr2qs_no_lookup("Message Style") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_privmsg OptionsWidget_message #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_privmsg 40 @@ -71,7 +72,7 @@ protected slots: void enableDisableSmartColorSelector(bool); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_timestamp KVI_SMALLICON_TIME +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_timestamp KviIconManager::Time #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_timestamp __tr2qs_no_lookup("Timestamp") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_timestamp OptionsWidget_message #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_timestamp 20 @@ -92,7 +93,7 @@ protected slots: void enableDisableTimestampSelector(bool); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_messageColors KVI_SMALLICON_MESSAGES +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_messageColors KviIconManager::Messages #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_messageColors __tr2qs_no_lookup("Message Colors") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_messageColors __tr2qs_no_lookup("theme,colors,messages,output") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_messageColors "theme" @@ -179,13 +180,13 @@ protected slots: void itemChanged(); void colorChanged(); void iconButtonClicked(); - void newIconSelected(int iconId); + void newIconSelected(KviIconManager::SmallIcon eIcon); virtual void commit(); virtual void save(); virtual void load(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_standardColors KVI_SMALLICON_COLORS +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_standardColors KviIconManager::Colors #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_standardColors __tr2qs_no_lookup("Color Set") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_standardColors __tr2qs_no_lookup("theme,colors,messages,output") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_standardColors "theme" diff --git a/src/modules/options/OptionsWidget_nickserv.h b/src/modules/options/OptionsWidget_nickserv.h index 241ffac2d..25f21c8ae 100644 --- a/src/modules/options/OptionsWidget_nickserv.h +++ b/src/modules/options/OptionsWidget_nickserv.h @@ -37,7 +37,7 @@ class QPushButton; class KviNickServRule; class QTreeWidget; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_nickServ KVI_SMALLICON_NICKSERV +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_nickServ KviIconManager::NickServ #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_nickServ __tr2qs_no_lookup("NickServ") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_nickServ OptionsWidget_tools #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_nickServ __tr2qs_no_lookup("authentication,identify") diff --git a/src/modules/options/OptionsWidget_notifier.h b/src/modules/options/OptionsWidget_notifier.h index 31e7ca628..fc2f7277a 100644 --- a/src/modules/options/OptionsWidget_notifier.h +++ b/src/modules/options/OptionsWidget_notifier.h @@ -29,7 +29,7 @@ #include <QComboBox> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifierLook KVI_SMALLICON_ALERT +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifierLook KviIconManager::Alert #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifierLook __tr2qs_no_lookup("Notifier") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifierLook __tr2qs_no_lookup("theme,colors,text") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notifierLook "theme" @@ -47,7 +47,7 @@ public: virtual void commit(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifier KVI_SMALLICON_ALERT +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifier KviIconManager::Alert #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifier __tr2qs_no_lookup("Notifier") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifier __tr2qs_no_lookup("popup") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_notifier OptionsWidget_interfaceFeatures diff --git a/src/modules/options/OptionsWidget_notify.h b/src/modules/options/OptionsWidget_notify.h index f29c2469e..514b3affa 100644 --- a/src/modules/options/OptionsWidget_notify.h +++ b/src/modules/options/OptionsWidget_notify.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify KVI_SMALLICON_REGUSERS +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify KviIconManager::RegUsers #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notify __tr2qs_no_lookup("Contacts") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_notify OptionsWidget_tools #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notify __tr2qs_no_lookup("notify,buddy,buddies,friends") diff --git a/src/modules/options/OptionsWidget_protection.h b/src/modules/options/OptionsWidget_protection.h index 18744dc66..8479964c5 100644 --- a/src/modules/options/OptionsWidget_protection.h +++ b/src/modules/options/OptionsWidget_protection.h @@ -28,7 +28,7 @@ #include "KviOptionsWidget.h" #include "KviSelectors.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection KVI_SMALLICON_SPY +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection KviIconManager::Spy #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_protection __tr2qs_no_lookup("Protection") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_protection OptionsWidget_irc #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection 60000 diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp index d05740441..8784e2a7b 100644 --- a/src/modules/options/OptionsWidget_proxy.cpp +++ b/src/modules/options/OptionsWidget_proxy.cpp @@ -88,13 +88,13 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent) addWidgetToLayout(vbox,1,1,1,1); QToolButton * tb = new QToolButton(vbox); - tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)))); + tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Proxy)))); tb->setAutoRaise(true); connect(tb,SIGNAL(clicked()),this,SLOT(newProxy())); mergeTip(tb,__tr2qs_ctx("New Proxy","options")); tb = new QToolButton(vbox); - tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)))); + tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)))); //tb->setEnabled(false); tb->setAutoRaise(true); connect(tb,SIGNAL(clicked()),this,SLOT(removeCurrent())); @@ -160,7 +160,7 @@ void OptionsWidget_proxy::fillProxyList() for(KviProxy * p = l->first();p;p = l->next()) { - prx = new ProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),p); + prx = new ProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KviIconManager::Proxy)),p); if(p == g_pProxyDataBase->currentProxy()) { prx->setSelected(true); @@ -323,15 +323,15 @@ void OptionsWidget_proxy::customContextMenuRequested(const QPoint &pos) { QTreeWidgetItem *it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos); m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy())); - m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent())),it); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Proxy)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy())); + m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent())),it); m_pContextPopup->popup(QCursor::pos()); } void OptionsWidget_proxy::newProxy() { KviProxy prx; - ProxyOptionsTreeWidgetItem * it = new ProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),&prx); + ProxyOptionsTreeWidgetItem * it = new ProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KviIconManager::Proxy)),&prx); it->setSelected(true); m_pTreeWidget->setCurrentItem(it); m_pTreeWidget->scrollToItem(it); diff --git a/src/modules/options/OptionsWidget_proxy.h b/src/modules/options/OptionsWidget_proxy.h index 53e19495b..429bd7bf9 100644 --- a/src/modules/options/OptionsWidget_proxy.h +++ b/src/modules/options/OptionsWidget_proxy.h @@ -25,8 +25,9 @@ //============================================================================= #include "KviOptionsWidget.h" -#include <QTreeWidget> +#include "KviIconManager.h" +#include <QTreeWidget> #include <QCheckBox> class QLabel; @@ -49,7 +50,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_proxy KVI_SMALLICON_PROXY +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_proxy KviIconManager::Proxy #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_proxy __tr2qs_no_lookup("Proxy Hosts") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_proxy OptionsWidget_connection #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_proxy __tr2qs_no_lookup("connection,servers") diff --git a/src/modules/options/OptionsWidget_query.h b/src/modules/options/OptionsWidget_query.h index fa3830e01..3cbc5afe7 100644 --- a/src/modules/options/OptionsWidget_query.h +++ b/src/modules/options/OptionsWidget_query.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_query KVI_SMALLICON_QUERY +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_query KviIconManager::Query #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_query __tr2qs_no_lookup("Query") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_query OptionsWidget_irc #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_query __tr2qs_no_lookup("chat") diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index 87be984fb..9ab9ad4a3 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -102,7 +102,7 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n QGridLayout * g = new QGridLayout(this); setWindowTitle(__tr2qs_ctx("Network Details","options")); - setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)))); + setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::World)))); QString szTmp = "<font size=\"+1\"><b>"; szTmp += n->name(); @@ -508,7 +508,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) QGridLayout * g = new QGridLayout(this); setWindowTitle(__tr2qs_ctx("Server Details","options")); - setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)))); + setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Server)))); m_pHeaderLabel = new QLabel("",this); // the text will be set later m_pHeaderLabel->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); @@ -614,7 +614,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) gl->setRowStretch(2,1); - tw->addTab(tab,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WHO)),__tr2qs_ctx("Identity","options")); + tw->addTab(tab,*(g_pIconManager->getSmallIcon(KviIconManager::Who)),__tr2qs_ctx("Identity","options")); // Connection tab @@ -797,7 +797,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) gl->setRowStretch(iRow,1); - tw->addTab(tab,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SOCKETWARNING)),__tr2qs_ctx("Connection","options")); + tw->addTab(tab,*(g_pIconManager->getSmallIcon(KviIconManager::SocketWarning)),__tr2qs_ctx("Connection","options")); // after login join channels tab = new QWidget(tw); @@ -813,7 +813,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) "text input below and click \"<b>Add</b>\".</center>","options")); gl->addWidget(m_pChannelListSelector,0,0); - tw->addTab(tab,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs_ctx("Join Channels","options")); + tw->addTab(tab,*(g_pIconManager->getSmallIcon(KviIconManager::Channel)),__tr2qs_ctx("Join Channels","options")); // after connect execute tab = new QWidget(tw); @@ -1269,19 +1269,19 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) addWidgetToLayout(vbox,1,0,1,0); m_pNewNetworkButton = new QToolButton(vbox); - m_pNewNetworkButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)))); + m_pNewNetworkButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::World)))); m_pNewNetworkButton->setAutoRaise(true); connect(m_pNewNetworkButton,SIGNAL(clicked()),this,SLOT(newNetwork())); KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options")); m_pNewServerButton = new QToolButton(vbox); - m_pNewServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)))); + m_pNewServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Server)))); m_pNewServerButton->setAutoRaise(true); connect(m_pNewServerButton,SIGNAL(clicked()),this,SLOT(newServer())); KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options")); m_pRemoveButton = new QToolButton(vbox); - m_pRemoveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)))); + m_pRemoveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)))); m_pRemoveButton->setEnabled(false); m_pRemoveButton->setAutoRaise(true); connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeCurrent())); @@ -1291,14 +1291,14 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) f->setFrameStyle(QFrame::Sunken | QFrame::HLine); m_pCopyServerButton = new QToolButton(vbox); - m_pCopyServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)))); + m_pCopyServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Copy)))); m_pCopyServerButton->setEnabled(false); m_pCopyServerButton->setAutoRaise(true); connect(m_pCopyServerButton,SIGNAL(clicked()),this,SLOT(copyServer())); KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options")); m_pPasteServerButton = new QToolButton(vbox); - m_pPasteServerButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE))); + m_pPasteServerButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Paste))); m_pPasteServerButton->setEnabled(false); m_pPasteServerButton->setAutoRaise(true); connect(m_pPasteServerButton,SIGNAL(clicked()),this,SLOT(pasteServer())); @@ -1308,7 +1308,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) f->setFrameStyle(QFrame::Sunken | QFrame::HLine); m_pImportButton = new QToolButton(vbox); - m_pImportButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)))); + m_pImportButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Folder)))); m_pImportButton->setAutoRaise(true); m_pImportButton->setMenu(m_pImportPopup); m_pImportButton->setPopupMode(QToolButton::InstantPopup); @@ -1334,7 +1334,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) connect(m_pRecentPopup,SIGNAL(activated(int)),this,SLOT(recentServersPopupClicked(int))); QToolButton * tb = new QToolButton(gbox); - tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)))); + tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Time)))); tb->setMenu(m_pRecentPopup); tb->setAutoRaise(true); tb->setPopupMode(QToolButton::InstantPopup); @@ -1537,13 +1537,13 @@ void OptionsWidget_servers::fillServerList() while(KviIrcNetwork * r = it.current()) { - net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r); + net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KviIconManager::World)),r); KviPointerList<KviIrcServer> * sl = r->serverList(); bool bCurrent = r->name() == g_pServerDataBase->currentNetworkName().toUtf8().data(); net->setExpanded(bCurrent); for(KviIrcServer * s = sl->first();s;s = sl->next()) { - srv = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),s); + srv = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KviIconManager::Server)),s); if((s == r->currentServer()) && bCurrent) { @@ -1700,16 +1700,16 @@ void OptionsWidget_servers::customContextMenuRequested(const QPoint &pnt) QTreeWidgetItem *it=(QTreeWidgetItem *) m_pTreeWidget->itemAt(pnt); bool bServer = (it && ((IrcServerOptionsTreeWidgetItem *)it)->m_pServerData); m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork())); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::World)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent())); m_pContextPopup->setItemEnabled(id,!bServer); m_pContextPopup->insertSeparator(); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs_ctx("&New Server","options"),this,SLOT(newServer())); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Server","options"),this,SLOT(removeCurrent())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Server)),__tr2qs_ctx("&New Server","options"),this,SLOT(newServer())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Re&move Server","options"),this,SLOT(removeCurrent())); m_pContextPopup->setItemEnabled(id,bServer); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs_ctx("&Copy Server","options"),this,SLOT(copyServer())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Copy)),__tr2qs_ctx("&Copy Server","options"),this,SLOT(copyServer())); m_pContextPopup->setItemEnabled(id,bServer); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),__tr2qs_ctx("&Paste Server","options"),this,SLOT(pasteServer())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Paste)),__tr2qs_ctx("&Paste Server","options"),this,SLOT(pasteServer())); m_pContextPopup->setItemEnabled(id,m_pClipboard); m_pContextPopup->insertSeparator(); @@ -1791,7 +1791,7 @@ void OptionsWidget_servers::importServer(const KviIrcServer &s,const QString &ne if(!net) { KviIrcNetwork d(network); - net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d); + net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KviIconManager::World)),&d); net->setExpanded(true); } @@ -1819,7 +1819,7 @@ void OptionsWidget_servers::importServer(const KviIrcServer &s,const QString &ne } // not found : add it! - IrcServerOptionsTreeWidgetItem * newServer = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&s); + IrcServerOptionsTreeWidgetItem * newServer = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KviIconManager::Server)),&s); m_pTreeWidget->setCurrentItem(newServer); m_pTreeWidget->scrollToItem(newServer); } @@ -1827,7 +1827,7 @@ void OptionsWidget_servers::importServer(const KviIrcServer &s,const QString &ne void OptionsWidget_servers::newNetwork() { KviIrcNetwork d(__tr2qs_ctx("New Network","options")); - IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d); + IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KviIconManager::World)),&d); it->setExpanded(true); it->setSelected(true); m_pTreeWidget->setCurrentItem(it); @@ -1851,7 +1851,7 @@ void OptionsWidget_servers::newServer() tmp.setCacheIp(false); tmp.generateUniqueId(); - IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&tmp); + IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KviIconManager::Server)),&tmp); net->setExpanded(true); @@ -1889,7 +1889,7 @@ void OptionsWidget_servers::pasteServer() else net = m_pLastEditedItem; IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net, - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),m_pClipboard); + *(g_pIconManager->getSmallIcon(KviIconManager::Server)),m_pClipboard); net->setExpanded(true); diff --git a/src/modules/options/OptionsWidget_servers.h b/src/modules/options/OptionsWidget_servers.h index cc24e3fe2..654c26aa6 100644 --- a/src/modules/options/OptionsWidget_servers.h +++ b/src/modules/options/OptionsWidget_servers.h @@ -161,7 +161,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_servers KVI_SMALLICON_SERVER +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_servers KviIconManager::Server #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_servers __tr2qs_no_lookup("Servers") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_servers __tr2qs_no_lookup("connection") //#define KVI_OPTIONS_WIDGET_NOPARENT_OptionsWidget_servers OptionsWidget_connection diff --git a/src/modules/options/OptionsWidget_sound.h b/src/modules/options/OptionsWidget_sound.h index 288999cc7..159571c33 100644 --- a/src/modules/options/OptionsWidget_sound.h +++ b/src/modules/options/OptionsWidget_sound.h @@ -29,7 +29,7 @@ #include <QComboBox> #include <QPushButton> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sound KVI_SMALLICON_SOUND +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sound KviIconManager::Sound #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sound __tr2qs_no_lookup("Sound") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_sound OptionsWidget_general #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_sound true @@ -43,7 +43,7 @@ public: ~OptionsWidget_sound(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_soundGeneral KVI_SMALLICON_SOUND +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_soundGeneral KviIconManager::Sound #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_soundGeneral __tr2qs_no_lookup("Sound System") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_soundGeneral OptionsWidget_sound #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_soundGeneral __tr2qs_no_lookup("sound,xmms,audio,play,amarok") @@ -80,7 +80,7 @@ protected slots: void mediaAutoDetect(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sounds KVI_SMALLICON_SOUND +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sounds KviIconManager::Sound #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sounds __tr2qs_no_lookup("Sounds") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_sounds OptionsWidget_sound #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sounds __tr2qs_no_lookup("sound,events") diff --git a/src/modules/options/OptionsWidget_textEncoding.h b/src/modules/options/OptionsWidget_textEncoding.h index 32764f186..964ad606f 100644 --- a/src/modules/options/OptionsWidget_textEncoding.h +++ b/src/modules/options/OptionsWidget_textEncoding.h @@ -28,7 +28,7 @@ #include <QComboBox> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textEncoding KVI_SMALLICON_TEXTENCODING +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textEncoding KviIconManager::TextEncoding #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textEncoding __tr2qs_no_lookup("Language") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textEncoding 50000 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_textEncoding OptionsWidget_general diff --git a/src/modules/options/OptionsWidget_textIcons.h b/src/modules/options/OptionsWidget_textIcons.h index 22526b3f7..4ef14cba8 100644 --- a/src/modules/options/OptionsWidget_textIcons.h +++ b/src/modules/options/OptionsWidget_textIcons.h @@ -35,7 +35,7 @@ class TextIconTableItem; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons KVI_SMALLICON_BIGGRIN +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons KviIconManager::BigGrin #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons __tr2qs_no_lookup("Text icons") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_textIcons OptionsWidget_tools #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textIcons __tr2qs_no_lookup("smileys,emoticons") diff --git a/src/modules/options/OptionsWidget_theme.h b/src/modules/options/OptionsWidget_theme.h index 520a0f0b1..18d260fc9 100644 --- a/src/modules/options/OptionsWidget_theme.h +++ b/src/modules/options/OptionsWidget_theme.h @@ -29,7 +29,7 @@ #include "KviSelectors.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_theme KVI_SMALLICON_GUI +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_theme KviIconManager::Gui #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_theme __tr2qs_no_lookup("General") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_theme __tr2qs_no_lookup("theme") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_theme "theme" @@ -44,7 +44,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeTransparency KVI_SMALLICON_TRANSPARENT +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeTransparency KviIconManager::Transparent #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeTransparency __tr2qs_no_lookup("Transparency") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeTransparency __tr2qs_no_lookup("theme,background") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_themeTransparency "theme" @@ -70,7 +70,7 @@ protected slots: void enableGlobalBackgroundPixmapSelector(bool); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeMdiArea KVI_SMALLICON_APPLET +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeMdiArea KviIconManager::Applet #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeMdiArea __tr2qs_no_lookup("Workspace") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeMdiArea __tr2qs_no_lookup("theme,mdi") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_themeMdiArea "theme" @@ -83,7 +83,7 @@ public: ~OptionsWidget_themeMdiArea(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeToolBarApplets KVI_SMALLICON_APPLET +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeToolBarApplets KviIconManager::Applet #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeToolBarApplets __tr2qs_no_lookup("ToolBar Applets") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeToolBarApplets __tr2qs_no_lookup("theme,toolbar") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_themeToolBarApplets "theme" diff --git a/src/modules/options/OptionsWidget_tools.h b/src/modules/options/OptionsWidget_tools.h index b52232109..40f9f2aac 100644 --- a/src/modules/options/OptionsWidget_tools.h +++ b/src/modules/options/OptionsWidget_tools.h @@ -29,7 +29,7 @@ #include "KviOptionsWidget.h" #include "KviSelectors.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools KVI_SMALLICON_ADDONS +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools KviIconManager::Addons #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tools __tr2qs_no_lookup("Tools") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_tools OptionsWidget_irc #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools 50000 diff --git a/src/modules/options/OptionsWidget_topicLabel.h b/src/modules/options/OptionsWidget_topicLabel.h index 820112363..fa473cf6d 100644 --- a/src/modules/options/OptionsWidget_topicLabel.h +++ b/src/modules/options/OptionsWidget_topicLabel.h @@ -28,7 +28,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_topicLabel KVI_SMALLICON_TOPIC +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_topicLabel KviIconManager::Topic #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_topicLabel __tr2qs_no_lookup("Labels") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_topicLabel __tr2qs_no_lookup("theme,topic") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_topicLabel "theme" diff --git a/src/modules/options/OptionsWidget_tray.h b/src/modules/options/OptionsWidget_tray.h index b31811ccf..c0a0259e6 100644 --- a/src/modules/options/OptionsWidget_tray.h +++ b/src/modules/options/OptionsWidget_tray.h @@ -28,7 +28,7 @@ #include <QComboBox> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray KVI_SMALLICON_TRAYICON +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray KviIconManager::TrayIcon #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray __tr2qs_no_lookup("Tray icon") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_tray OptionsWidget_interfaceFeatures #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tray __tr2qs_no_lookup("tray,TRAYICON") diff --git a/src/modules/options/OptionsWidget_uparser.h b/src/modules/options/OptionsWidget_uparser.h index 0781ed104..d1689be9e 100644 --- a/src/modules/options/OptionsWidget_uparser.h +++ b/src/modules/options/OptionsWidget_uparser.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser KVI_SMALLICON_PARSERWARNING +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser KviIconManager::ParserWarning #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_uparser __tr2qs_no_lookup("Scripting Engine") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_uparser __tr2qs_no_lookup("scripting,kvs,debug") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_uparser OptionsWidget_general diff --git a/src/modules/options/OptionsWidget_urlHandlers.h b/src/modules/options/OptionsWidget_urlHandlers.h index 31a44fc7a..9a4868490 100644 --- a/src/modules/options/OptionsWidget_urlHandlers.h +++ b/src/modules/options/OptionsWidget_urlHandlers.h @@ -28,7 +28,7 @@ class QRadioButton; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers KVI_SMALLICON_WORLD +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers KviIconManager::World #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers __tr2qs_no_lookup("URL handlers") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_urlHandlers OptionsWidget_general #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers 70000 diff --git a/src/modules/options/OptionsWidget_userList.h b/src/modules/options/OptionsWidget_userList.h index 4d78d91d0..43112ad82 100644 --- a/src/modules/options/OptionsWidget_userList.h +++ b/src/modules/options/OptionsWidget_userList.h @@ -28,7 +28,7 @@ #include <QComboBox> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userList KVI_SMALLICON_USERLIST +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userList KviIconManager::UserList #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userList __tr2qs_no_lookup("Userlist") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userList __tr2qs_no_lookup("theme,userlist,channel") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userList "theme" @@ -42,7 +42,7 @@ public: ~OptionsWidget_userList(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground KVI_SMALLICON_TRANSPARENT +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground KviIconManager::Transparent #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListBackground __tr2qs_no_lookup("Background") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListBackground __tr2qs_no_lookup("theme,userlist,channel,background") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListBackground "theme" @@ -63,7 +63,7 @@ public: virtual void commit(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListForeground KVI_SMALLICON_USERLIST +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListForeground KviIconManager::UserList #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListForeground __tr2qs_no_lookup("Foreground") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListForeground __tr2qs_no_lookup("theme,userlist,channel,colors") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListForeground "theme" @@ -79,7 +79,7 @@ public: ~OptionsWidget_userListForeground(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListGrid KVI_SMALLICON_GUI +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListGrid KviIconManager::Gui #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListGrid __tr2qs_no_lookup("Nickname Grid") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListGrid __tr2qs_no_lookup("theme,userlist,channel,grid") #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListGrid "theme" @@ -99,7 +99,7 @@ public: virtual void commit(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListFeatures KVI_SMALLICON_GUI +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListFeatures KviIconManager::Gui #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListFeatures __tr2qs_no_lookup("Features") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListFeatures __tr2qs_no_lookup("userlist,channel") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_userListFeatures OptionsWidget_userList diff --git a/src/modules/options/OptionsWidget_windowList.h b/src/modules/options/OptionsWidget_windowList.h index 4d3d2db76..fc1198d22 100644 --- a/src/modules/options/OptionsWidget_windowList.h +++ b/src/modules/options/OptionsWidget_windowList.h @@ -30,7 +30,7 @@ #include <QComboBox> -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowList KVI_SMALLICON_CLASSICWINDOWLIST +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowList KviIconManager::ClassicWindowList #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowList __tr2qs_no_lookup("Window List") #define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_OptionsWidget_windowList 2 #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowList __tr2qs_no_lookup("theme") @@ -44,7 +44,7 @@ public: ~OptionsWidget_windowList(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTree KVI_SMALLICON_TREEWINDOWLIST +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTree KviIconManager::TreeWindowList #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTree __tr2qs_no_lookup("Tree Window List") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_windowListTree OptionsWidget_windowList #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTree __tr2qs_no_lookup("theme") @@ -60,7 +60,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground KVI_SMALLICON_TREEWINDOWLIST +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground KviIconManager::TreeWindowList #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeForeground __tr2qs_no_lookup("Foreground") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_windowListTreeForeground OptionsWidget_windowListTree #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskForegroundBarOptionsWidget __tr2qs_no_lookup("theme") @@ -75,7 +75,7 @@ public: }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground KVI_SMALLICON_TREEWINDOWLIST +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground KviIconManager::TreeWindowList #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeBackground __tr2qs_no_lookup("Background") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_windowListTreeBackground OptionsWidget_windowListTree #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBackgroundBarOptionsWidget __tr2qs_no_lookup("theme") @@ -94,7 +94,7 @@ public: virtual void commit(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeFeatures KVI_SMALLICON_TREEWINDOWLIST +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeFeatures KviIconManager::TreeWindowList #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeFeatures __tr2qs_no_lookup("Features") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_windowListTreeFeatures OptionsWidget_windowListTree #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskFeaturesBarOptionsWidget __tr2qs_no_lookup("theme") @@ -108,7 +108,7 @@ public: ~OptionsWidget_windowListTreeFeatures(); }; -#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListClassic KVI_SMALLICON_CLASSICWINDOWLIST +#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListClassic KviIconManager::ClassicWindowList #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListClassic __tr2qs_no_lookup("Classic Window List") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_windowListClassic OptionsWidget_windowList #define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_OptionsWidget_windowListClassic 2 diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index e80cab7a6..90ce32781 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -80,7 +80,7 @@ OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidget *parent,Opt m_pInstanceEntry = e; m_pOptionsWidget = 0; setText(0,e->szName); - setIcon(0,*(g_pIconManager->getSmallIcon(e->iIcon))); + setIcon(0,*(g_pIconManager->getSmallIcon(e->eIcon))); parent->insertTopLevelItem(0, this); } @@ -90,7 +90,7 @@ OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidgetItem *parent m_pInstanceEntry = e; m_pOptionsWidget = 0; setText(0,e->szName); - setIcon(0,*(g_pIconManager->getSmallIcon(e->iIcon))); + setIcon(0,*(g_pIconManager->getSmallIcon(e->eIcon))); parent->insertChild(0, this); } @@ -103,7 +103,7 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup) { setObjectName("general_options_dialog"); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::KVIrc))); m_szGroup = szGroup; @@ -191,7 +191,7 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup) connect(m_pSearchLineEdit,SIGNAL(returnPressed()),this,SLOT(searchClicked())); m_pSearchButton = new QToolButton(hbox); m_pSearchButton->setIconSize(QSize(16,16)); - m_pSearchButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH))); + m_pSearchButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Search))); connect(m_pSearchButton,SIGNAL(clicked()),this,SLOT(searchClicked())); connect(m_pSearchLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(searchLineEditTextChanged(const QString &))); @@ -231,14 +231,14 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup) KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options")); connect(b,SIGNAL(clicked()),this,SLOT(okClicked())); //b->setMinimumWidth(whatIsThisWidth); - b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g1->addWidget(b,1,2); b = new QPushButton(__tr2qs_ctx("&Apply","options"),this); b->setObjectName("btnapply"); KviTalToolTip::add(b,__tr2qs_ctx("Commit all changes immediately.","options")); connect(b,SIGNAL(clicked()),this,SLOT(applyClicked())); - b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g1->addWidget(b,1,3); b = new QPushButton(__tr2qs_ctx("Cancel","options"),this); @@ -247,7 +247,7 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup) b->setDefault(true); //b->setMinimumWidth(whatIsThisWidth); connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked())); - b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); g1->addWidget(b,1,4); g1->setRowStretch(0,1); diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh index a73e1ca2f..2adc1ba99 100755 --- a/src/modules/options/mkcreateinstanceproc.sh +++ b/src/modules/options/mkcreateinstanceproc.sh @@ -52,26 +52,27 @@ cat >> OptionsInstanceManager.h <<EOF #include "KviModule.h" #include "KviPointerList.h" #include "KviQString.h" +#include "KviIconManager.h" typedef struct _OptionsWidgetInstanceEntry OptionsWidgetInstanceEntry; typedef struct _OptionsWidgetInstanceEntry { - KviOptionsWidget * (*createProc)(QWidget *); - KviOptionsWidget * pWidget; // singleton - int iIcon; - QString szName; - QString szNameNoLocale; - const char * szClassName; - int iPriority; - QString szKeywords; - QString szKeywordsNoLocale; - QString szGroup; - bool bIsContainer; - bool bIsNotContained; + KviOptionsWidget * (*createProc)(QWidget *); + KviOptionsWidget * pWidget; // singleton + KviIconManager::SmallIcon eIcon; + QString szName; + QString szNameNoLocale; + const char * szClassName; + int iPriority; + QString szKeywords; + QString szKeywordsNoLocale; + QString szGroup; + bool bIsContainer; + bool bIsNotContained; KviPointerList<OptionsWidgetInstanceEntry> * pChildList; - bool bDoInsert; // a helper for OptionsDialog::fillListView() + bool bDoInsert; // a helper for OptionsDialog::fillListView() } OptionsWidgetInstanceEntry; @@ -82,16 +83,16 @@ public: OptionsInstanceManager(); virtual ~OptionsInstanceManager(); protected: - KviPointerList<OptionsWidgetInstanceEntry> * m_pInstanceTree; + KviPointerList<OptionsWidgetInstanceEntry> * m_pInstanceTree; public: KviPointerList<OptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; }; - KviOptionsWidget * getInstance(OptionsWidgetInstanceEntry * e,QWidget * par); - OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName); - void cleanup(KviModule * m); + KviOptionsWidget * getInstance(OptionsWidgetInstanceEntry * pEntry, QWidget * pPar); + OptionsWidgetInstanceEntry * findInstanceEntry(const char * pcName); + void cleanup(KviModule *); protected: - OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l); - OptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l); - void deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l); + OptionsWidgetInstanceEntry * findInstanceEntry(const char * pcName, KviPointerList<OptionsWidgetInstanceEntry> * pList); + OptionsWidgetInstanceEntry * findInstanceEntry(const QObject * pObj, KviPointerList<OptionsWidgetInstanceEntry> * pList); + void deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * pList); protected slots: void widgetDestroyed(); }; @@ -153,7 +154,6 @@ done cat >> OptionsInstanceManager.cpp <<EOF #include "KviLocale.h" -#include "KviIconManager.h" #include "OptionsInstanceManager.h" int g_iOptionWidgetInstances = 0; @@ -233,7 +233,7 @@ printclass() echo "_createInstanceProc;" >> $TARGET echo "$3 e$1->pWidget = 0;" >> $TARGET echo "$3 e$1->szClassName = g_szClassName_$2;" >> $TARGET - echo "$3 e$1->iIcon = KVI_OPTIONS_WIDGET_ICON_$2;" >> $TARGET + echo "$3 e$1->eIcon = KVI_OPTIONS_WIDGET_ICON_$2;" >> $TARGET echo "$3 #ifdef KVI_OPTIONS_WIDGET_PRIORITY_$2" >> $TARGET echo "$3 e$1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_$2;" >> $TARGET @@ -304,30 +304,30 @@ cat >> $TARGET <<EOF } -void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l) +void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * pList) { - if(l) + if(pList) { - for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) + for(OptionsWidgetInstanceEntry * pEntry = pList->first(); pEntry; pEntry = pList->next()) { - if(e->pWidget) + if(pEntry->pWidget) { - if(e->pWidget->parent()->inherits("OptionsWidgetContainer")) + if(pEntry->pWidget->parent()->inherits("OptionsWidgetContainer")) { - disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); - delete e->pWidget->parent(); - e->pWidget = 0; + disconnect(pEntry->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); + delete pEntry->pWidget->parent(); + pEntry->pWidget = 0; } else { qDebug("Ops...i have deleted the options dialog ?"); } } //else qDebug("Clas %s has no widget",e->szName); - if(e->pChildList)deleteInstanceTree(e->pChildList); + if(pEntry->pChildList) + deleteInstanceTree(pEntry->pChildList); } - delete l; + delete pList; } } - OptionsInstanceManager::~OptionsInstanceManager() { if(m_pInstanceTree) @@ -342,121 +342,126 @@ void OptionsInstanceManager::cleanup(KviModule *) void OptionsInstanceManager::widgetDestroyed() { - OptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree); - if(e) - e->pWidget = 0; + OptionsWidgetInstanceEntry * pEntry = findInstanceEntry(sender(),m_pInstanceTree); + if(pEntry) + pEntry->pWidget = 0; if(g_iOptionWidgetInstances > 0) g_iOptionWidgetInstances--; } -KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * e,QWidget * par) +KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * pEntry, QWidget * pPar) { - if(!e) + if(!pEntry) return NULL; #if 0 - if(e->pWidget) + if(pEntry->pWidget) { - if(e->pWidget->parent() != par) + if(pEntry->pWidget->parent() != pPar) { - QWidget * oldPar = (QWidget *)e->pWidget->parent(); - e->pWidget->setParent(par); - oldPar->deleteLater(); - e->pWidget=0; + QWidget * pOldPar = (QWidget *)pEntry->pWidget->parent(); + pEntry->pWidget->setParent(pPar); + pOldPar->deleteLater(); + pEntry->pWidget = 0; } } #endif - if(!(e->pWidget)) + if(!(pEntry->pWidget)) { - e->pWidget = e->createProc(par); + pEntry->pWidget = pEntry->createProc(pPar); g_iOptionWidgetInstances++; - connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); + connect(pEntry->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); } - if(e->pWidget->parent() != par) + if(pEntry->pWidget->parent() != pPar) { - QWidget * oldPar = (QWidget *)e->pWidget->parent(); - e->pWidget->setParent(par); //reparent(par,QPoint(0,0)); - if(oldPar->inherits("OptionsWidgetContainer")) - delete oldPar; + QWidget * pOldPar = (QWidget *)pEntry->pWidget->parent(); + pEntry->pWidget->setParent(pPar); //reparent(pPar,QPoint(0,0)); + if(pOldPar->inherits("OptionsWidgetContainer")) + delete pOldPar; // else it's very likely a QStackedWidget, child of a KviOptionsWidget: don't delete } - if(e->bIsContainer) + if(pEntry->bIsContainer) { // need to create the container structure! - e->pWidget->createTabbedPage(); - if(e->pChildList) + pEntry->pWidget->createTabbedPage(); + if(pEntry->pChildList) { - KviPointerList<OptionsWidgetInstanceEntry> tmp; - tmp.setAutoDelete(false); + KviPointerList<OptionsWidgetInstanceEntry> tmpList; + tmpList.setAutoDelete(false); - for(OptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next()) + for(OptionsWidgetInstanceEntry * pEntry2 = pEntry->pChildList->first(); pEntry2; pEntry2 = pEntry->pChildList->next()) { // add only non containers and widgets not explicitly marked as noncontained - if((!e2->bIsContainer) && (!e2->bIsNotContained)) + if((!pEntry2->bIsContainer) && (!pEntry2->bIsNotContained)) { - OptionsWidgetInstanceEntry * ee = tmp.first(); - int idx = 0; - while(ee) + OptionsWidgetInstanceEntry * pEntry3 = tmpList.first(); + int iIdx = 0; + while(pEntry3) { - if(ee->iPriority >= e2->iPriority)break; - idx++; - ee = tmp.next(); + if(pEntry3->iPriority >= pEntry2->iPriority) + break; + iIdx++; + pEntry3 = tmpList.next(); } - tmp.insert(idx,e2); + tmpList.insert(iIdx,pEntry2); } } - for(OptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev()) + for(OptionsWidgetInstanceEntry * pEntry4 = tmpList.last(); pEntry4; pEntry4 = tmpList.prev()) { - KviOptionsWidget * ow = getInstance(e3,e->pWidget->tabWidget()); - e->pWidget->addOptionsWidget(e3->szName,*(g_pIconManager->getSmallIcon(e3->iIcon)),ow); + KviOptionsWidget * pOpt = getInstance(pEntry4,pEntry->pWidget->tabWidget()); + pEntry->pWidget->addOptionsWidget(pEntry4->szName,*(g_pIconManager->getSmallIcon(pEntry4->eIcon)),pOpt); } } } - return e->pWidget; + return pEntry->pWidget; } -OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l) +OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QObject * pObj, KviPointerList<OptionsWidgetInstanceEntry> * pList) { - if(l) + if(pList) { - for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) + for(OptionsWidgetInstanceEntry * pEntry = pList->first(); pEntry; pEntry = pList->next()) { - if(ptr == e->pWidget)return e; - if(e->pChildList) + if(pObj == pEntry->pWidget) + return pEntry; + if(pEntry->pChildList) { - OptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList); - if(e2)return e2; + OptionsWidgetInstanceEntry * pEntry2 = findInstanceEntry(pObj,pEntry->pChildList); + if(pEntry2) + return pEntry2; } } } return 0; } -OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l) +OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName, KviPointerList<OptionsWidgetInstanceEntry> * pList) { - if(l) + if(pList) { - for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) + for(OptionsWidgetInstanceEntry * pEntry = pList->first(); pEntry; pEntry = pList->next()) { - if(kvi_strEqualCI(e->szClassName,clName))return e; - if(e->pChildList) + if(kvi_strEqualCI(pEntry->szClassName,pcName)) + return pEntry; + if(pEntry->pChildList) { - OptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList); - if(e2)return e2; + OptionsWidgetInstanceEntry * pEntry2 = findInstanceEntry(pcName,pEntry->pChildList); + if(pEntry2) + return pEntry2; } } } return 0; } -OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName) +OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName) { - return findInstanceEntry(clName,m_pInstanceTree); + return findInstanceEntry(pcName,m_pInstanceTree); } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp index f7e5ed24a..a45f828a7 100644 --- a/src/modules/popupeditor/PopupEditorWindow.cpp +++ b/src/modules/popupeditor/PopupEditorWindow.cpp @@ -422,26 +422,26 @@ void SinglePopupEditor::customContextMenuRequested(const QPoint &pos) m_pContextPopup->setItemEnabled( m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)), + *(g_pIconManager->getSmallIcon(KviIconManager::Cut)), __tr2qs_ctx("Cu&t","editor"), this,SLOT(contextCut())),it); m_pContextPopup->setItemEnabled( m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)), + *(g_pIconManager->getSmallIcon(KviIconManager::Copy)), __tr2qs_ctx("&Copy","editor"), this,SLOT(contextCopy())),it); m_pContextPopup->setItemEnabled( m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)), + *(g_pIconManager->getSmallIcon(KviIconManager::Paste)), __tr2qs_ctx("&Paste Below","editor"),this,SLOT(contextPasteBelow())), m_pClipboard); m_pContextPopup->setItemEnabled( m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)), + *(g_pIconManager->getSmallIcon(KviIconManager::Paste)), __tr2qs_ctx("Paste Above","editor"),this,SLOT(contextPasteAbove())),it && m_pClipboard); m_pContextPopup->setItemEnabled( m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)), + *(g_pIconManager->getSmallIcon(KviIconManager::Paste)), __tr2qs_ctx("Paste Inside","editor"),this,SLOT(contextPasteInside())),it && bIsMenu && m_pClipboard); bool bSeparatorInserted = false; @@ -451,7 +451,7 @@ void SinglePopupEditor::customContextMenuRequested(const QPoint &pos) m_pContextPopup->insertSeparator(); bSeparatorInserted = true; m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROLOGUE)), + *(g_pIconManager->getSmallIcon(KviIconManager::Prologue)), __tr2qs_ctx("New Menu Prologue","editor"),this,SLOT(contextNewPrologue())); // } @@ -459,7 +459,7 @@ void SinglePopupEditor::customContextMenuRequested(const QPoint &pos) // { if(!bSeparatorInserted)m_pContextPopup->insertSeparator(); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_EPILOGUE)), + *(g_pIconManager->getSmallIcon(KviIconManager::Epilogue)), __tr2qs_ctx("New Menu Epilogue","editor"),this,SLOT(contextNewEpilogue())); // } @@ -1010,7 +1010,7 @@ void SinglePopupEditor::edit(MenuTreeWidgetItem * it) MenuTreeWidgetItem::MenuTreeWidgetItem(QTreeWidget * par,KviKvsPopupMenu * popup) : QTreeWidgetItem(par) { - setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUP))); + setIcon(0,*(g_pIconManager->getSmallIcon(KviIconManager::Popup))); setText(0,popup->popupName()); m_pPopup = popup; } @@ -1144,19 +1144,19 @@ void PopupEditorWidget::customContextMenuRequested(const QPoint &pos) m_pContextPopup->clear(); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUP)), + *(g_pIconManager->getSmallIcon(KviIconManager::Popup)), __tr2qs_ctx("&New Popup","editor"), this,SLOT(newPopup())); m_pContextPopup->setItemEnabled( m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)), + *(g_pIconManager->getSmallIcon(KviIconManager::Quit)), __tr2qs_ctx("Re&move Popup","editor"), this,SLOT(removeCurrentPopup())),it); m_pContextPopup->setItemEnabled( m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("&Export Popup To...","editor"), this,SLOT(exportCurrentPopup())),it); @@ -1165,7 +1165,7 @@ void PopupEditorWidget::customContextMenuRequested(const QPoint &pos) m_pEmptyContextPopup->clear(); m_pEmptyContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUP)), + *(g_pIconManager->getSmallIcon(KviIconManager::Popup)), __tr2qs_ctx("&New Popup","editor"), this,SLOT(newPopup())); m_pEmptyContextPopup->popup(QCursor::pos()); @@ -1379,17 +1379,17 @@ PopupEditorWindow::PopupEditorWindow(KviMainWindow * lpFrm) QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(okClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(btn,1,1); btn = new QPushButton(__tr2qs_ctx("&Apply","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(btn,1,2); btn = new QPushButton(__tr2qs_ctx("Cancel","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); g->addWidget(btn,1,3); g->setRowStretch(0,1); @@ -1420,7 +1420,7 @@ void PopupEditorWindow::cancelClicked() QPixmap * PopupEditorWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUP); + return g_pIconManager->getSmallIcon(KviIconManager::Popup); } void PopupEditorWindow::fillCaptionBuffers() diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp index 234472c8d..0f1ba2b37 100644 --- a/src/modules/raweditor/RawEditorWindow.cpp +++ b/src/modules/raweditor/RawEditorWindow.cpp @@ -152,24 +152,24 @@ void RawEditorWidget::customContextMenuRequested(const QPoint &pos) { if(!(((RawHandlerTreeWidgetItem *)it)->m_bEnabled)) m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Handler)), __tr2qs_ctx("&Enable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled())); else m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)), + *(g_pIconManager->getSmallIcon(KviIconManager::HandlerDisabled)), __tr2qs_ctx("&Disable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled())); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)), + *(g_pIconManager->getSmallIcon(KviIconManager::Quit)), __tr2qs_ctx("Re&move Handler","editor"), this,SLOT(removeCurrentHandler())); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("&Export Handler To...","editor"), this,SLOT(exportCurrentHandler())); } else { m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)), + *(g_pIconManager->getSmallIcon(KviIconManager::Handler)), __tr2qs_ctx("&New Handler","editor"), this,SLOT(addHandlerForCurrentRaw())); } @@ -177,7 +177,7 @@ void RawEditorWidget::customContextMenuRequested(const QPoint &pos) m_pContextPopup->insertSeparator(); m_pContextPopup->insertItem( - *(g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT)), + *(g_pIconManager->getSmallIcon(KviIconManager::RawEvent)), __tr2qs_ctx("&Add Raw Event...","editor"), this,SLOT(addRaw())); m_pContextPopup->popup(mapToGlobal(QPoint(pos.x()+15,pos.y()))); @@ -477,17 +477,17 @@ RawEditorWindow::RawEditorWindow(KviMainWindow * lpFrm) QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(okClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(btn,1,1); btn = new QPushButton(__tr2qs_ctx("&Apply","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(applyClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(btn,1,2); btn = new QPushButton(__tr2qs_ctx("Cancel","editor"),this); connect(btn,SIGNAL(clicked()),this,SLOT(cancelClicked())); - btn->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + btn->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); g->addWidget(btn,1,3); g->setRowStretch(0,1); @@ -518,7 +518,7 @@ void RawEditorWindow::cancelClicked() QPixmap * RawEditorWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT); + return g_pIconManager->getSmallIcon(KviIconManager::RawEvent); } void RawEditorWindow::fillCaptionBuffers() diff --git a/src/modules/raweditor/RawEditorWindow.h b/src/modules/raweditor/RawEditorWindow.h index d0d689496..6d2d9823c 100644 --- a/src/modules/raweditor/RawEditorWindow.h +++ b/src/modules/raweditor/RawEditorWindow.h @@ -57,8 +57,8 @@ public: public: void setEnabled(bool bEnabled) { - if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT))); - else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENTNOHANDLERS))); + if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KviIconManager::RawEvent))); + else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KviIconManager::RawEventNoHandlers))); ((RawTreeWidget*)treeWidget())->updateItem(this); }; }; @@ -76,8 +76,8 @@ public: public: void setEnabled(bool bEnabled) { - if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER))); - else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED))); + if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KviIconManager::Handler))); + else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KviIconManager::HandlerDisabled))); ((RawTreeWidget*)treeWidget())->updateItem(this); }; QString m_szBuffer; diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp index cd49e6e86..b8678759b 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.cpp +++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp @@ -76,7 +76,7 @@ RegisteredUserPropertiesDialog::RegisteredUserPropertiesDialog(QWidget * p,KviPo m_pPropertyDict = dict; setWindowTitle(__tr2qs_ctx("Property Editor","register")); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINUX))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Linux))); QGridLayout * g = new QGridLayout(this); @@ -101,11 +101,11 @@ RegisteredUserPropertiesDialog::RegisteredUserPropertiesDialog(QWidget * p,KviPo m_pAddButton = new QPushButton(__tr2qs_ctx("&New","register"),vb); connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); - m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); + m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem))); m_pDelButton = new QPushButton(__tr2qs_ctx("&Remove","register"),vb); connect(m_pDelButton,SIGNAL(clicked()),this,SLOT(delClicked())); - m_pDelButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); + m_pDelButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DeleteItem))); KviTalHBox * b = new KviTalHBox(this); b->setSpacing(4); @@ -113,11 +113,11 @@ RegisteredUserPropertiesDialog::RegisteredUserPropertiesDialog(QWidget * p,KviPo g->addWidget(b,1,1); QPushButton * pb = new QPushButton(__tr2qs_ctx("&OK","register"),b); connect(pb,SIGNAL(clicked()),this,SLOT(okClicked())); - pb->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + pb->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); pb = new QPushButton(__tr2qs_ctx("Cancel","register"),b); connect(pb,SIGNAL(clicked()),this,SLOT(reject())); - pb->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + pb->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); g->setRowStretch(1,1); g->setColumnStretch(0,1); @@ -316,7 +316,7 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget *p,KviRegisteredUse //setMinimumSize(400,450); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINUX))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Linux))); setWindowTitle(__tr2qs_ctx("Registered User Entry","register")); QWidget * p1 = new QWidget(this); @@ -354,17 +354,17 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget *p,KviRegisteredUse m_pAddMaskButton = new QPushButton(__tr2qs_ctx("&Add...","register"),b); connect(m_pAddMaskButton,SIGNAL(clicked()),this,SLOT(addMaskClicked())); - m_pAddMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); + m_pAddMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem))); m_pDelMaskButton = new QPushButton(__tr2qs_ctx("Re&move","register"),b); m_pDelMaskButton->setEnabled(false); connect(m_pDelMaskButton,SIGNAL(clicked()),this,SLOT(delMaskClicked())); - m_pDelMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); + m_pDelMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DeleteItem))); m_pEditMaskButton = new QPushButton(__tr2qs_ctx("&Edit","register"),b); m_pEditMaskButton->setEnabled(false); connect(m_pEditMaskButton,SIGNAL(clicked()),this,SLOT(editMaskClicked())); - m_pEditMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM))); + m_pEditMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::EditItem))); g->setRowStretch(4,1); g->setColumnStretch(1,1); diff --git a/src/modules/reguser/RegistrationWizard.cpp b/src/modules/reguser/RegistrationWizard.cpp index 0c4cc6a38..f511fdfdc 100644 --- a/src/modules/reguser/RegistrationWizard.cpp +++ b/src/modules/reguser/RegistrationWizard.cpp @@ -75,7 +75,7 @@ RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUse // resize( 490, 456 ); setWindowTitle(__tr2qs_ctx("User Registration Wizard - KVIrc","register")); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINUX))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Linux))); setSizeGripEnabled( TRUE ); diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index 774275414..4025b93c6 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -185,11 +185,11 @@ void RegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOptionV if(it->user()) { if(!it->user()->getProperty("notify").isEmpty()) - p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+LVI_BORDER,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTIFYONLINE))); + p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+LVI_BORDER,*(g_pIconManager->getSmallIcon(KviIconManager::NotifyOnLine))); else - p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+LVI_BORDER,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTIFYOFFLINE))); + p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+LVI_BORDER,*(g_pIconManager->getSmallIcon(KviIconManager::NotifyOffLine))); if(it->user()->ignoreEnagled()) - p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+2*LVI_BORDER+16,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IGNORE))); + p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+2*LVI_BORDER+16,*(g_pIconManager->getSmallIcon(KviIconManager::Ignore))); } } } @@ -219,7 +219,7 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par) g_pLocalRegisteredUserDataBase = new KviRegisteredUserDataBase(); g_pLocalRegisteredUserDataBase->copyFrom(g_pRegisteredUserDataBase); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_REGUSERS))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::RegUsers))); setWindowTitle(__tr2qs_ctx("Registered Users - KVIrc","register")); QGridLayout * g = new QGridLayout(this); @@ -240,31 +240,31 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par) m_pWizardAddButton = new QPushButton(__tr2qs_ctx("Add (Wizard)...","register"),vbox); connect(m_pWizardAddButton,SIGNAL(clicked()),this,SLOT(addWizardClicked())); m_pWizardAddButton->setToolTip(__tr2qs_ctx("Add a registered user by means of a user-friendly wizard.","register")); - m_pWizardAddButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEMBYWIZARD))); + m_pWizardAddButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItemByWizard))); m_pAddButton = new QPushButton(__tr2qs_ctx("&Add...","register"),vbox); connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); m_pAddButton->setToolTip(__tr2qs_ctx("Open the edit dialog to create a new user entry.","register")); - m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); + m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem))); m_pAddGroupButton = new QPushButton(__tr2qs_ctx("&Add Group...","register"),vbox); connect(m_pAddGroupButton,SIGNAL(clicked()),this,SLOT(addGroupClicked())); m_pAddGroupButton->setToolTip(__tr2qs_ctx("Adds a new group","register")); - m_pAddGroupButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); + m_pAddGroupButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem))); m_pRemoveButton = new QPushButton(__tr2qs_ctx("Re&move","register"),vbox); connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeClicked())); m_pRemoveButton->setEnabled(false); m_pRemoveButton->setToolTip(__tr2qs_ctx("Remove the currently selected entries.","register")); - m_pRemoveButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); + m_pRemoveButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DeleteItem))); m_pEditButton = new QPushButton(__tr2qs_ctx("&Edit...","register"),vbox); connect(m_pEditButton,SIGNAL(clicked()),this,SLOT(editClicked())); m_pEditButton->setEnabled(false); m_pEditButton->setToolTip(__tr2qs_ctx("Edit the first selected entry.","register")); - m_pEditButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM))); + m_pEditButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::EditItem))); QFrame * f = new QFrame(vbox); f->setFrameStyle(QFrame::HLine | QFrame::Sunken); @@ -272,19 +272,19 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par) m_pSelectAllButton = new QPushButton(__tr2qs_ctx("Select all","register"),vbox); connect(m_pSelectAllButton,SIGNAL(clicked()),this,SLOT(selectAllClicked())); m_pSelectAllButton->setToolTip(__tr2qs_ctx("Select all the entries","register")); - m_pSelectAllButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLUS))); + m_pSelectAllButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Plus))); m_pExportButton = new QPushButton(__tr2qs_ctx("Export To...","register"),vbox); m_pExportButton->setEnabled(false); connect(m_pExportButton,SIGNAL(clicked()),this,SLOT(exportClicked())); m_pExportButton->setToolTip(__tr2qs_ctx("Export the selected entries to a file.<br>All the data associated with the selected registered users will be exported.<br>You (or anyone else) can later import the entries by using the \"Import\" button.","register")); - m_pExportButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY))); + m_pExportButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Floppy))); m_pImportButton = new QPushButton(__tr2qs_ctx("Import From...","register"),vbox); connect(m_pImportButton,SIGNAL(clicked()),this,SLOT(importClicked())); m_pImportButton->setToolTip(__tr2qs_ctx("Import entries from a file exported earlier by the \"export\" function of this dialog.","register")); - m_pImportButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER))); + m_pImportButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Folder))); KviTalHBox * hbox = new KviTalHBox(this); @@ -296,12 +296,12 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par) b = new QPushButton(__tr2qs_ctx("&OK","register"),hbox); connect(b,SIGNAL(clicked()),this,SLOT(okClicked())); - b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); //b->setMinimumWidth(120); b = new QPushButton(__tr2qs_ctx("Cancel","register"),hbox); connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked())); - b->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); //b->setMinimumWidth(120); g->addItem(new QSpacerItem(0, 15), 2, 0); diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp index 61a6c64ed..d404eb7fa 100644 --- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp +++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp @@ -97,11 +97,11 @@ SharedFileEditDialog::SharedFileEditDialog(QWidget * par,KviSharedFile * f) pb = new QPushButton(__tr2qs_ctx("&OK","sharedfileswindow"),this); connect(pb,SIGNAL(clicked()),this,SLOT(okClicked())); - pb->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); + pb->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); g->addWidget(pb,5,2); pb = new QPushButton(__tr2qs_ctx("Cancel","sharedfileswindow"),this); connect(pb,SIGNAL(clicked()),this,SLOT(reject())); - pb->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); + pb->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); g->addWidget(pb,5,3); g->setRowStretch(4,1); @@ -676,7 +676,7 @@ void SharedFilesWindow::getBaseLogFileName(QString &buffer) QPixmap * SharedFilesWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_SHAREDFILES); + return g_pIconManager->getSmallIcon(KviIconManager::SharedFiles); } void SharedFilesWindow::resizeEvent(QResizeEvent *) diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp index 99e4bee13..7235d5878 100644 --- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp @@ -123,7 +123,7 @@ static bool sharedfileswindow_module_init(KviModule * m) __tr2qs_ctx("Manage S&hared Files","sharedfileswindow"), sharedfileswindow_extension_alloc); - if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SHAREDFILES))); + if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::SharedFiles))); KVSM_REGISTER_SIMPLE_COMMAND(m,"open",sharedfileswindow_kvs_cmd_open); return true; diff --git a/src/modules/socketspy/CMakeLists.txt b/src/modules/socketspy/CMakeLists.txt index 6ca7ca2a7..92414809c 100644 --- a/src/modules/socketspy/CMakeLists.txt +++ b/src/modules/socketspy/CMakeLists.txt @@ -1,12 +1,12 @@ # CMakeLists for src/modules/socketspy SET(kvisocketspy_MOC_HDRS - socketspywindow.h + SocketSpyWindow.h ) SET(kvisocketspy_SRCS libkvisocketspy.cpp - socketspywindow.cpp + SocketSpyWindow.cpp ) # After this call, files will be moc'ed to moc_kvi_*.cpp diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/SocketSpyWindow.cpp index 04e05f8b9..056de8a83 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/SocketSpyWindow.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : socketspywindow.cpp +// File : SocketSpyWindow.cpp // Creation date : Thu Aug 31 2000 15:02:22 by Szymon Stefanek // // This file is part of the KVIrc irc client distribution @@ -22,7 +22,7 @@ // //============================================================================= -#include "socketspywindow.h" +#include "SocketSpyWindow.h" #include "KviIconManager.h" #include "KviIrcView.h" @@ -57,7 +57,7 @@ void SocketSpyWindow::die() QPixmap * SocketSpyWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_SPY); + return g_pIconManager->getSmallIcon(KviIconManager::Spy); } void SocketSpyWindow::resizeEvent(QResizeEvent *) diff --git a/src/modules/socketspy/socketspywindow.h b/src/modules/socketspy/SocketSpyWindow.h index 7030eb89f..181f25e57 100644 --- a/src/modules/socketspy/socketspywindow.h +++ b/src/modules/socketspy/SocketSpyWindow.h @@ -2,7 +2,7 @@ #define _SOCKETSPYWINDOW_H_ //============================================================================= // -// File : socketspywindow.h +// File : SocketSpyWindow.h // Creation date : Sun Nov 26 2000 13:13:00 CEST by Szymon Stefanek // // This file is part of the KVIrc irc client distribution diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp index aca97aad5..7b845e232 100644 --- a/src/modules/socketspy/libkvisocketspy.cpp +++ b/src/modules/socketspy/libkvisocketspy.cpp @@ -21,7 +21,7 @@ // //============================================================================= -#include "socketspywindow.h" +#include "SocketSpyWindow.h" #include "KviModule.h" #include "KviMainWindow.h" diff --git a/src/modules/term/TermWidget.cpp b/src/modules/term/TermWidget.cpp index 4d5bedd61..21bcf2549 100644 --- a/src/modules/term/TermWidget.cpp +++ b/src/modules/term/TermWidget.cpp @@ -62,7 +62,7 @@ m_pTitleLabel = new QLabel(__tr2qs("Terminal emulator"),m_pHBox); m_pTitleLabel->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); m_pCloseButton = new QPushButton("",m_pHBox); - m_pCloseButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE))); + m_pCloseButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Close))); m_pCloseButton->setToolTip(__tr2qs("Close this window")); m_pHBox->setStretchFactor(m_pTitleLabel,2); connect(m_pCloseButton,SIGNAL(clicked()),this,SLOT(closeClicked())); diff --git a/src/modules/term/TermWindow.cpp b/src/modules/term/TermWindow.cpp index e58a32dc2..e5014a09e 100644 --- a/src/modules/term/TermWindow.cpp +++ b/src/modules/term/TermWindow.cpp @@ -54,7 +54,7 @@ QPixmap * TermWindow::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_RAW); + return g_pIconManager->getSmallIcon(KviIconManager::Raw); } void TermWindow::resizeEvent(QResizeEvent *) diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp index 24be11c6f..768ffa8ea 100644 --- a/src/modules/texticons/libkvitexticons.cpp +++ b/src/modules/texticons/libkvitexticons.cpp @@ -23,6 +23,7 @@ //============================================================================= #include "KviModule.h" +#include "KviIconManager.h" #include "KviTextIconManager.h" /* @@ -114,7 +115,7 @@ static bool texticons_kvs_cmd_set(KviKvsModuleCommandCall * c) pIcon = g_pTextIconManager->lookupTextIcon(szName); if(!pIcon) { - KviTextIcon * pTmpIcon = new KviTextIcon(-1); + KviTextIcon * pTmpIcon = new KviTextIcon(KviIconManager::None); g_pTextIconManager->insert(szName,*pTmpIcon); delete pTmpIcon; pIcon = g_pTextIconManager->lookupTextIcon(szName); diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp index f1062cb94..681ac076c 100644 --- a/src/modules/theme/ThemeFunctions.cpp +++ b/src/modules/theme/ThemeFunctions.cpp @@ -282,7 +282,7 @@ namespace ThemeFunctions hd.szButton2Text = __tr2qs_ctx("Yes, Proceed","theme"); hd.iDefaultButton = 2; hd.iCancelButton = 1; - hd.pixIcon = *(g_pIconManager->getSmallIcon(KVI_SMALLICON_THEME)); + hd.pixIcon = *(g_pIconManager->getSmallIcon(KviIconManager::Theme)); hd.iMinimumWidth = 350; hd.iMinimumHeight = 420; hd.iFlags = KviHtmlDialogData::ForceMinimumSize; diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index 5595cd19e..a94b1ff04 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -112,7 +112,7 @@ ThemeManagementDialog::ThemeManagementDialog(QWidget * parent) m_pItemDelegate=0; setObjectName("theme_options_widget"); setWindowTitle(__tr2qs_ctx("Manage Themes - KVIrc","theme")); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_THEME))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Theme))); m_pInstance = this; @@ -280,8 +280,8 @@ void ThemeManagementDialog::contextMenuRequested(const QPoint & pos) { m_pListWidget->setCurrentItem(m_pListWidget->itemAt(pos)); m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs_ctx("&Remove Theme","theme"),this,SLOT(deleteTheme())); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)),__tr2qs_ctx("&Apply Theme","theme"),this,SLOT(applyCurrentTheme())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Minus)),__tr2qs_ctx("&Remove Theme","theme"),this,SLOT(deleteTheme())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Accept)),__tr2qs_ctx("&Apply Theme","theme"),this,SLOT(applyCurrentTheme())); m_pContextPopup->popup(m_pListWidget->viewport()->mapToGlobal(pos)); } } diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index d5e39744d..3d44325d7 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -92,7 +92,7 @@ TipWindow::TipWindow() m_pShowAtStartupCheck = new QCheckBox(__tr2qs("Show at startup"),this); m_pShowAtStartupCheck->setChecked(KVI_OPTION_BOOL(KviOption_boolShowTipAtStartup)); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Idea))); setWindowTitle(__tr2qs("Did you know...")); diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp index f4cb97608..e79fc482a 100644 --- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp +++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp @@ -134,7 +134,7 @@ CustomToolBarPropertiesDialog::CustomToolBarPropertiesDialog(QWidget * p,const Q m_szLabel = szLabel; setWindowTitle(__tr2qs_ctx("ToolBar Properties","editor")); - setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)))); + setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::ToolBar)))); setModal(true); QGridLayout * g = new QGridLayout(this); @@ -292,7 +292,7 @@ CustomizeToolBarsDialog::CustomizeToolBarsDialog(QWidget * p) { setObjectName("Toolbar_editor"); setWindowTitle(__tr2qs_ctx("Customize Toolbars","editor")); - setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR))); + setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::ToolBar))); m_pInstance = this; diff --git a/src/modules/torrent/StatusBarApplet.cpp b/src/modules/torrent/StatusBarApplet.cpp index a464cd8be..a1cefe733 100644 --- a/src/modules/torrent/StatusBarApplet.cpp +++ b/src/modules/torrent/StatusBarApplet.cpp @@ -61,7 +61,7 @@ void StatusBarApplet::selfRegister(KviStatusBar *bar) __tr2qs_ctx("Torrent Client","torrent"), "torrentapplet", CreateTorrentClientApplet, - "torrent", *(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY))); + "torrent", *(g_pIconManager->getSmallIcon(KviIconManager::Away))); bar->registerAppletDescriptor(d); } diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index bc3ee7d78..acec41bd7 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -93,24 +93,24 @@ TrayIcon::TrayIcon(KviMainWindow * frm) m_pContextPopup->insertItem(m_pTitleLabel); m_pContextPopup->setWindowTitle(__tr2qs("Context")); m_pAwayMenuId = m_pContextPopup->addMenu(m_pAwayPopup); - m_pAwayMenuId->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY))); + m_pAwayMenuId->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Away))); m_pAwayMenuId->setText(__tr2qs("Away")); - QAction* id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_OPTIONS)),__tr2qs("&Configure KVIrc..."),this,SLOT(executeInternalCommand(bool))); + QAction* id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Options)),__tr2qs("&Configure KVIrc..."),this,SLOT(executeInternalCommand(bool))); id->setData(KVI_INTERNALCOMMAND_OPTIONS_DIALOG); - id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("&About KVIrc"),this,SLOT(executeInternalCommand(bool))); + id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::KVIrc)),__tr2qs("&About KVIrc"),this,SLOT(executeInternalCommand(bool))); id->setData(KVI_INTERNALCOMMAND_ABOUT_ABOUTKVIRC); m_pContextPopup->insertSeparator(); - m_pToggleFrame = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RAW)),__tr2qs("Hide/Show"),this,SLOT(toggleParentFrame())); + m_pToggleFrame = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Raw)),__tr2qs("Hide/Show"),this,SLOT(toggleParentFrame())); m_pContextPopup->insertSeparator(); - id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TRAYICON)),__tr2qs("Un&dock"),this,SLOT(executeInternalCommand(bool))); + id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::TrayIcon)),__tr2qs("Un&dock"),this,SLOT(executeInternalCommand(bool))); id->setData(KVI_INTERNALCOMMAND_TRAYICON_HIDE); - id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pFrame,SLOT(close()),QKeySequence(Qt::CTRL + Qt::Key_Q)); + id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::QuitApp)),__tr2qs("&Quit"),g_pFrame,SLOT(close()),QKeySequence(Qt::CTRL + Qt::Key_Q)); connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(fillContextPopup())); @@ -293,10 +293,10 @@ void TrayIcon::fillContextPopup() m_pAwayMenuId->setVisible(true); m_pAwayPopup->clear(); - QAction* pAllAway=m_pAwayPopup->addAction(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on all"),this,SLOT(doAway(bool))); + QAction * pAllAway = m_pAwayPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Console)),__tr2qs("Away on all"),this,SLOT(doAway(bool))); pAllAway->setData(-1); - QAction* pAllUnaway=m_pAwayPopup->addAction(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on all"),this,SLOT(doAway(bool))); + QAction * pAllUnaway = m_pAwayPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Console)),__tr2qs("Back on all"),this,SLOT(doAway(bool))); pAllUnaway->setData(-2); QAction* pSeparator=m_pAwayPopup->addSeparator(); @@ -315,11 +315,11 @@ void TrayIcon::fillContextPopup() QAction* id; if(pConsole->connection()->userInfo()->isAway()) { - id=m_pAwayPopup->addAction(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").arg(pConsole->currentNetworkName()),this,SLOT(doAway(bool))); + id=m_pAwayPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Console)),__tr2qs("Back on %1").arg(pConsole->currentNetworkName()),this,SLOT(doAway(bool))); id->setData(pConsole->context()->id()); bAllUnaway=0; } else { - id=m_pAwayPopup->addAction(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").arg(pConsole->currentNetworkName()),this,SLOT(doAway(bool))); + id=m_pAwayPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Console)),__tr2qs("Away on %1").arg(pConsole->currentNetworkName()),this,SLOT(doAway(bool))); id->setData(pConsole->context()->id()); bAllAway=0; } @@ -397,7 +397,7 @@ void TrayIcon::refresh() if(m_bFlashed) { - thisRestrictionOfQt4IsNotNice.drawPixmap((ICON_SIZE-16)/2,(ICON_SIZE-16)/2,16,16,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),0,0,16,16); + thisRestrictionOfQt4IsNotNice.drawPixmap((ICON_SIZE-16)/2,(ICON_SIZE-16)/2,16,16,*(g_pIconManager->getSmallIcon(KviIconManager::Message)),0,0,16,16); } else { thisRestrictionOfQt4IsNotNice.drawPixmap(0,0,ICON_SIZE/2,ICON_SIZE/2, m_iOther ? diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index a0c61e557..d9bb68f6c 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -148,7 +148,7 @@ KviUrlAction::KviUrlAction(QObject * pParent) __tr2qs("Shows the URL list window"), KviActionManager::categoryGeneric(), "kvi_bigicon_www.png", - QString("%1").arg(KVI_SMALLICON_URL) + QString("%1").arg(KviIconManager::Url) ) { } @@ -363,7 +363,7 @@ void UrlDialog::sayToWin(QAction * act) QPixmap *UrlDialog::myIconPtr() { - return g_pIconManager->getSmallIcon(KVI_SMALLICON_URL); + return g_pIconManager->getSmallIcon(KviIconManager::Url); } void UrlDialog::addUrl(QString url, QString window, QString count, QString timestamp) @@ -877,7 +877,7 @@ static bool url_module_init(KviModule *m) KVI_URL_EXTENSION_NAME, __tr2qs("View URL list"), url_extension_alloc); - if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL))); + if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Url))); g_pList = new KviPointerList<KviUrl>; g_pList->setAutoDelete(true); diff --git a/src/modules/window/UserWindow.cpp b/src/modules/window/UserWindow.cpp index 72962304e..72aef3925 100644 --- a/src/modules/window/UserWindow.cpp +++ b/src/modules/window/UserWindow.cpp @@ -23,8 +23,6 @@ //============================================================================= #include "UserWindow.h" - -#include "KviIconManager.h" #include "KviInput.h" #include "KviIrcView.h" #include "KviMainWindow.h" @@ -33,14 +31,14 @@ extern KviPointerList<UserWindow> * g_pUserWindowList; -UserWindow::UserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole,int iCreationFlags) -: KviWindow(KVI_WINDOW_TYPE_USERWINDOW,pFrm,name,pConsole) +UserWindow::UserWindow(KviMainWindow * pFrm, const char * pcName, int iIcon, KviConsoleWindow * pConsole, int iCreationFlags) +: KviWindow(KVI_WINDOW_TYPE_USERWINDOW,pFrm,pcName,pConsole) { g_pUserWindowList->append(this); m_iIcon = iIcon; - m_szPlainTextCaption = name; + m_szPlainTextCaption = pcName; fillSingleColorCaptionBuffers(m_szPlainTextCaption); // Register ourselves @@ -63,12 +61,14 @@ UserWindow::UserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConso m_pInput = 0; // applyOptions(); - if(context())context()->registerContextWindow(this); + if(context()) + context()->registerContextWindow(this); } UserWindow::~UserWindow() { - if(context())context()->unregisterContextWindow(this); + if(context()) + context()->unregisterContextWindow(this); g_pUserWindowList->removeRef(this); } @@ -94,7 +94,7 @@ void UserWindow::fillCaptionBuffers() // nothing here } -void UserWindow::setWindowTitleStrings(const QString &szPlainText) +void UserWindow::setWindowTitleStrings(const QString & szPlainText) { m_szPlainTextCaption = szPlainText; updateCaption(); diff --git a/src/modules/window/UserWindow.h b/src/modules/window/UserWindow.h index 6e0e0e392..1f0303647 100644 --- a/src/modules/window/UserWindow.h +++ b/src/modules/window/UserWindow.h @@ -33,16 +33,16 @@ class UserWindow : public KviWindow public: enum CreationFlags { HasInput = 1 }; public: - UserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole = 0,int iCreationFlags = 0); + UserWindow(KviMainWindow * pFrm, const char * pcName, int iIcon, KviConsoleWindow * pConsole = 0, int iCreationFlags = 0); ~UserWindow(); protected: int m_iIcon; protected: - virtual void resizeEvent(QResizeEvent *e); + virtual void resizeEvent(QResizeEvent *); virtual QPixmap * myIconPtr(); virtual void fillCaptionBuffers(); public: - void setWindowTitleStrings(const QString &szPlainText); + void setWindowTitleStrings(const QString & szPlainText); }; -#endif //!_USERWINDOW_H_ +#endif // _USERWINDOW_H_ diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index edb12774a..dfc105720 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -1151,10 +1151,11 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("irc_context",KVS_PT_UINT,KVS_PF_OPTIONAL,uCtx) KVSM_PARAMETER("icon",KVS_PT_INT,KVS_PF_OPTIONAL,iIcon) KVSM_PARAMETERS_END(c) - iIcon = iIcon % KVI_NUM_SMALL_ICONS; + iIcon = iIcon % KviIconManager::IconCount; int iFlags = 0; - if(szFlags.contains('i'))iFlags |= UserWindow::HasInput; + if(szFlags.contains('i')) + iFlags |= UserWindow::HasInput; KviConsoleWindow * pConsole = 0; if(c->parameterList()->count() >= 3) @@ -1166,17 +1167,18 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) } } - UserWindow * wnd = new UserWindow( + UserWindow * pWnd = new UserWindow( c->window()->frame(), szCaption.toUtf8().data(), iIcon, pConsole, iFlags); - c->window()->frame()->addWindow(wnd,!szFlags.contains('m')); - if(szFlags.contains('m'))wnd->minimize(); + c->window()->frame()->addWindow(pWnd,!szFlags.contains('m')); + if(szFlags.contains('m')) + pWnd->minimize(); - c->returnValue()->setInteger(QString(wnd->id()).toUInt()); + c->returnValue()->setInteger(QString(pWnd->id()).toUInt()); return true; } |