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 /src/modules | |
| 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
Diffstat (limited to 'src/modules')
96 files changed, 633 insertions, 611 deletions
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; } |