diff options
Diffstat (limited to 'src/modules')
65 files changed, 478 insertions, 479 deletions
diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp index b3e06c285..69a0ecf76 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.cpp +++ b/src/modules/aliaseditor/AliasEditorWindow.cpp @@ -150,7 +150,7 @@ AliasEditorWidget::AliasEditorWidget(QWidget * par) connect(m_pEditor,SIGNAL(find(const QString &)),this,SLOT(slotFindWord(const QString &))); connect(m_pEditor,SIGNAL(replaceAll(const QString &,const QString &)),this,SLOT(slotReplaceAll(const QString &,const QString &))); - m_pContextPopup = new KviTalPopupMenu(this); + m_pContextPopup = new QMenu(this); oneTimeSetup(); @@ -555,14 +555,12 @@ void AliasEditorWidget::customContextMenuRequested(const QPoint pnt) m_pContextPopup->clear(); m_pLastClickedItem = (AliasEditorTreeWidgetItem *)m_pTreeWidget->itemAt(pnt); - int id; - - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Alias)), __tr2qs_ctx("Add Alias","editor"), this,SLOT(newAlias())); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Alias)), __tr2qs_ctx("Add Namespace","editor"), this,SLOT(newNamespace())); @@ -570,49 +568,47 @@ void AliasEditorWidget::customContextMenuRequested(const QPoint pnt) bool bHasItems = m_pTreeWidget->topLevelItemCount(); bool bHasSelected = hasSelectedItems(); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - id = m_pContextPopup->insertItem( + QAction *pAction = m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Quit)), __tr2qs_ctx("Remove Selected","editor"), this,SLOT(removeSelectedItems())); - m_pContextPopup->setItemEnabled(id,bHasSelected); + pAction->setEnabled(bHasSelected); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export Selected...","editor"), - this,SLOT(exportSelected())); - m_pContextPopup->setItemEnabled(id,bHasSelected); + this,SLOT(exportSelected())) + ->setEnabled(bHasSelected); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export Selected in singles files...","editor"), - this,SLOT(exportSelectedSepFiles())); - - m_pContextPopup->setItemEnabled(id,bHasSelected); + this,SLOT(exportSelectedSepFiles())) + ->setEnabled(bHasSelected); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export All...","editor"), - this,SLOT(exportAll())); - m_pContextPopup->setItemEnabled(id,bHasItems); + this,SLOT(exportAll())) + ->setEnabled(bHasItems); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Search)), __tr2qs_ctx("Find In Aliases...","editor"), - this,SLOT(slotFind())); - m_pContextPopup->setItemEnabled(id,bHasItems); + this,SLOT(slotFind())) + ->setEnabled(bHasItems); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::NameSpace)), __tr2qs_ctx("Collapse All Namespaces","editor"), - this,SLOT(slotCollapseNamespaces())); - - m_pContextPopup->setItemEnabled(id,bHasItems); + this,SLOT(slotCollapseNamespaces())) + ->setEnabled(bHasItems); m_pContextPopup->popup( m_pTreeWidget->mapToGlobal(pnt)); } diff --git a/src/modules/aliaseditor/AliasEditorWindow.h b/src/modules/aliaseditor/AliasEditorWindow.h index ab11953a5..d48fa6b24 100644 --- a/src/modules/aliaseditor/AliasEditorWindow.h +++ b/src/modules/aliaseditor/AliasEditorWindow.h @@ -27,7 +27,7 @@ #include "KviWindow.h" #include "KviCString.h" #include "KviPointerList.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviHeapObject.h" #include <QWidget> @@ -96,7 +96,7 @@ public: QPushButton * m_pRenameButton; AliasEditorTreeWidgetItem * m_pLastEditedItem; AliasEditorTreeWidgetItem * m_pLastClickedItem; - KviTalPopupMenu * m_pContextPopup; + QMenu * m_pContextPopup; QSplitter * m_pSplitter; QString m_szDir; bool m_bSaving; diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp index 4712b691f..71f3b9eb0 100644 --- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp +++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp @@ -273,9 +273,9 @@ void ChannelsJoinDialogTreeWidget::mousePressEvent(QMouseEvent *e) pDialog->itemSelected(); if(!m_pJoinPopup) { - m_pJoinPopup = new KviTalPopupMenu(this); - 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 = new QMenu(this); + m_pJoinPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Join)),__tr2qs("Join"),pDialog,SLOT(joinClicked())); + m_pJoinPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),__tr2qs("Delete"),pDialog,SLOT(deleteClicked())); } m_pJoinPopup->popup(QCursor::pos()); diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.h b/src/modules/channelsjoin/ChannelsJoinDialog.h index 7e3a62965..91bd46a13 100644 --- a/src/modules/channelsjoin/ChannelsJoinDialog.h +++ b/src/modules/channelsjoin/ChannelsJoinDialog.h @@ -32,7 +32,7 @@ #include "KviWindow.h" #include "KviCString.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QTreeWidget> #include <QDialog> @@ -62,7 +62,7 @@ public: delete m_pJoinPopup; }; protected: - KviTalPopupMenu * m_pJoinPopup; + QMenu * m_pJoinPopup; /** * \brief Called when the user clicks on the list * \param e mouse event descriptor diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp index 2358ec2f0..8484b267c 100644 --- a/src/modules/classeditor/ClassEditorWindow.cpp +++ b/src/modules/classeditor/ClassEditorWindow.cpp @@ -221,7 +221,7 @@ ClassEditorWidget::ClassEditorWidget(QWidget * pParent) m_pEditor->setFocus(); connect(m_pEditor,SIGNAL(find(const QString &)),this,SLOT(slotFindWord(const QString &))); connect(m_pEditor,SIGNAL(replaceAll(const QString &,const QString &)),this,SLOT(slotReplaceAll(const QString &,const QString &))); - m_pContextPopup = new KviTalPopupMenu(this); + m_pContextPopup = new QMenu(this); oneTimeSetup(); @@ -879,80 +879,79 @@ void ClassEditorWidget::customContextMenuRequested(QPoint pnt) m_pLastClickedItem = (ClassEditorTreeWidgetItem *)m_pTreeWidget->itemAt(pnt); - int iId; - iId = m_pContextPopup->insertItem( + QAction *pAction = m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::NameSpace)), __tr2qs_ctx("Add Namespace","editor"), this,SLOT(newNamespace())); if(!m_pLastClickedItem) - m_pContextPopup->setItemEnabled(iId,true); + pAction->setEnabled(true); else - m_pContextPopup->setItemEnabled(iId,m_pLastClickedItem->isNamespace()); + pAction->setEnabled(m_pLastClickedItem->isNamespace()); - iId = m_pContextPopup->insertItem( + pAction = m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Class)), __tr2qs_ctx("Add Class","editor"), this,SLOT(newClass())); if(!m_pLastClickedItem) - m_pContextPopup->setItemEnabled(iId,true); + pAction->setEnabled(true); else - m_pContextPopup->setItemEnabled(iId,m_pLastClickedItem->isNamespace()); + pAction->setEnabled(m_pLastClickedItem->isNamespace()); - iId = m_pContextPopup->insertItem( + pAction = m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Function)), __tr2qs_ctx("Add Member Function","editor"), this,SLOT(newMemberFunction())); if(!m_pLastClickedItem) - m_pContextPopup->setItemEnabled(iId,false); + pAction->setEnabled(false); else - m_pContextPopup->setItemEnabled(iId,m_pLastClickedItem->isClass()| m_pLastClickedItem->isMethod()); + pAction->setEnabled(m_pLastClickedItem->isClass()| m_pLastClickedItem->isMethod()); bool bHasItems = m_pTreeWidget->topLevelItemCount(); bool bHasSelected = hasSelectedItems(); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - iId = m_pContextPopup->insertItem( + pAction = m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Quit)), __tr2qs_ctx("Remove Selected","editor"), this,SLOT(removeSelectedItems())); - m_pContextPopup->setItemEnabled(iId,bHasSelected); + pAction->setEnabled(bHasSelected); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export Selected...","editor"), this,SLOT(exportSelected())); - m_pContextPopup->setItemEnabled(iId,bHasSelected); + pAction->setEnabled(bHasSelected); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export Selected in singles files...","editor"), this,SLOT(exportSelectedSepFiles())); - m_pContextPopup->setItemEnabled(iId,bHasSelected); + pAction->setEnabled(bHasSelected); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Export All...","editor"), this,SLOT(exportAll())); - m_pContextPopup->setItemEnabled(iId,bHasItems); + pAction->setEnabled(bHasItems); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Search)), __tr2qs_ctx("Find In Classes...","editor"), this,SLOT(slotFind())); - m_pContextPopup->setItemEnabled(iId,bHasItems); + pAction->setEnabled(bHasItems); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::NameSpace)), __tr2qs_ctx("Collapse All Items","editor"), this,SLOT(slotCollapseItems())); - m_pContextPopup->setItemEnabled(iId,bHasItems); + pAction->setEnabled(bHasItems); m_pContextPopup->popup(m_pTreeWidget->mapToGlobal(pnt)); } diff --git a/src/modules/classeditor/ClassEditorWindow.h b/src/modules/classeditor/ClassEditorWindow.h index abb6ebb2c..cf41f64b6 100644 --- a/src/modules/classeditor/ClassEditorWindow.h +++ b/src/modules/classeditor/ClassEditorWindow.h @@ -33,7 +33,7 @@ #include "KviWindow.h" #include "KviCString.h" #include "KviPointerList.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviHeapObject.h" #include "KviKvsObjectClass.h" @@ -286,7 +286,7 @@ public: ClassEditorTreeWidgetItem * m_pLastEditedItem; ClassEditorTreeWidgetItem * m_pLastClickedItem; - KviTalPopupMenu * m_pContextPopup; + QMenu * m_pContextPopup; QSplitter * m_pSplitter; QString m_szDir; bool m_bSaving; diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp index fb2f5de6a..28e8fc1b0 100644 --- a/src/modules/codetester/CodeTesterWindow.cpp +++ b/src/modules/codetester/CodeTesterWindow.cpp @@ -36,7 +36,7 @@ #include "KviParameterList.h" #include "KviKvsScript.h" #include "KviKvsVariantList.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QPushButton> #include <QLayout> diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index 251828fc2..dcb9fc320 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -1281,15 +1281,16 @@ void DccFileTransfer::abort() displayUpdate(); } -void DccFileTransfer::fillContextPopup(KviTalPopupMenu * m) +void DccFileTransfer::fillContextPopup(QMenu * m) { - m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,SLOT(configureBandwidth())); - m->insertSeparator(); - m->insertItem(__tr2qs_ctx("Resend DCC","dcc"),this,SLOT(retryDCC())); - m->insertItem(__tr2qs_ctx("Resend TDCC","dcc"),this,SLOT(retryTDCC())); - m->insertItem(__tr2qs_ctx("Resend RevDCC","dcc"),this,SLOT(retryRevDCC())); - int id = m->insertItem(__tr2qs_ctx("Abort","dcc"),this,SLOT(abort())); - if(!active())m->setItemEnabled(id,false); + m->addAction(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,SLOT(configureBandwidth())); + m->addSeparator(); + m->addAction(__tr2qs_ctx("Resend DCC","dcc"),this,SLOT(retryDCC())); + m->addAction(__tr2qs_ctx("Resend TDCC","dcc"),this,SLOT(retryTDCC())); + m->addAction(__tr2qs_ctx("Resend RevDCC","dcc"),this,SLOT(retryRevDCC())); + QAction *pAction = m->addAction(__tr2qs_ctx("Abort","dcc"),this,SLOT(abort())); + if(!active()) + pAction->setEnabled(false); } void DccFileTransfer::configureBandwidth() diff --git a/src/modules/dcc/DccFileTransfer.h b/src/modules/dcc/DccFileTransfer.h index d55fb3673..6f04013c5 100644 --- a/src/modules/dcc/DccFileTransfer.h +++ b/src/modules/dcc/DccFileTransfer.h @@ -34,7 +34,7 @@ #include "KviPointerList.h" #include "KviFileTransfer.h" #include "KviTimeUtils.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviTalHBox.h" #include "KviTalVBox.h" @@ -49,7 +49,7 @@ class QTimer; class QPainter; class DccFileTransfer; class DccMarshal; -class KviTalPopupMenu; +class QMenu; typedef struct _KviDccSendThreadOptions { @@ -216,7 +216,7 @@ public: virtual void displayPaint(QPainter * p,int column, QRect rect); virtual int displayHeight(int iLineSpacing); - virtual void fillContextPopup(KviTalPopupMenu * m); + virtual void fillContextPopup(QMenu * m); virtual void fillStatusString(QString &szBuffer); virtual bool active(); virtual QString tipText(); diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 18cb9badd..20daa1418 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -27,7 +27,7 @@ #ifdef COMPILE_DCC_CANVAS #include "KviCString.h" #include "KviLocale.h" - #include "KviTalPopupMenu.h" + #include "QMenu.h" #include <QCursor> #include <QPainter> @@ -1229,8 +1229,8 @@ case QVariant::Bool: { QComboBox * b = new QComboBox(false,table()->viewport()); - b->insertItem("FALSE"); - b->insertItem("TRUE"); + b->addAction("FALSE"); + b->addAction("TRUE"); b->setCurrentItem(m_property.toBool() ? 1 : 0); return b; } @@ -1254,20 +1254,20 @@ tmp.setNum(m_property.toFont().pointSize()); tmp.prepend(", "); tmp.prepend(m_property.toFont().family()); - b->insertItem(tmp); - b->insertItem(tmpDefault + ", 8"); - b->insertItem(tmpDefault + ", 10"); - b->insertItem(tmpDefault + ", 12"); - b->insertItem(tmpDefault + ", 14"); - b->insertItem(tmpDefault + ", 16"); - b->insertItem(tmpDefault + ", 18"); - b->insertItem(tmpDefault + ", 20"); - b->insertItem(tmpDefault + ", 24"); - b->insertItem(tmpDefault + ", 28"); - b->insertItem(tmpDefault + ", 32"); - b->insertItem(tmpDefault + ", 40"); - b->insertItem(tmpDefault + ", 48"); - b->insertItem(f.family() + ", 12"); + b->addAction(tmp); + b->addAction(tmpDefault + ", 8"); + b->addAction(tmpDefault + ", 10"); + b->addAction(tmpDefault + ", 12"); + b->addAction(tmpDefault + ", 14"); + b->addAction(tmpDefault + ", 16"); + b->addAction(tmpDefault + ", 18"); + b->addAction(tmpDefault + ", 20"); + b->addAction(tmpDefault + ", 24"); + b->addAction(tmpDefault + ", 28"); + b->addAction(tmpDefault + ", 32"); + b->addAction(tmpDefault + ", 40"); + b->addAction(tmpDefault + ", 48"); + b->addAction(f.family() + ", 12"); b->setCurrentItem(0); b->setCurrentItem(m_property.toBool() ? 1 : 0); return b; @@ -1471,28 +1471,28 @@ connect(m_pPropertiesWidget,SIGNAL(propertyChanged(const QString &,const QVariant &)),m_pCanvasView,SLOT(propertyChanged(const QString &,const QVariant &))); - KviTalPopupMenu * add = new KviTalPopupMenu(m_pMenuBar); - KviTalPopupMenu * shapes = new KviTalPopupMenu(add); - KviTalPopupMenu * polygons = new KviTalPopupMenu(add); - KviTalPopupMenu * items = new KviTalPopupMenu(add); - shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,SLOT(insertLine())); - shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,SLOT(insertRectangle())); - shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,SLOT(insertEllipse())); - shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,SLOT(insertPie())); - shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,SLOT(insertChord())); + QMenu * add = new QMenu(m_pMenuBar); + QMenu * shapes = new QMenu(add); + QMenu * polygons = new QMenu(add); + QMenu * items = new QMenu(add); + shapes->addAction(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,SLOT(insertLine())); + shapes->addAction(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,SLOT(insertRectangle())); + shapes->addAction(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,SLOT(insertEllipse())); + shapes->addAction(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,SLOT(insertPie())); + shapes->addAction(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,SLOT(insertChord())); - items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,SLOT(insertRichText())); + items->addAction(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,SLOT(insertRichText())); - polygons->insertItem(__tr2qs_ctx("&Triangle","dcc"),m_pCanvasView,SLOT(insertPolygonTriangle())); - polygons->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,SLOT(insertPolygonRectangle())); - polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,SLOT(insertPolygonPentagon())); - polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,SLOT(insertPolygonHexagon())); + polygons->addAction(__tr2qs_ctx("&Triangle","dcc"),m_pCanvasView,SLOT(insertPolygonTriangle())); + polygons->addAction(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,SLOT(insertPolygonRectangle())); + polygons->addAction(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,SLOT(insertPolygonPentagon())); + polygons->addAction(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,SLOT(insertPolygonHexagon())); - add->insertItem(__tr2qs_ctx("&Shape","dcc"),shapes); - add->insertItem(__tr2qs_ctx("&Item","dcc"),items); - add->insertItem(__tr2qs_ctx("&Polygons","dcc"),polygons); + add->addAction(__tr2qs_ctx("&Shape","dcc"),shapes); + add->addAction(__tr2qs_ctx("&Item","dcc"),items); + add->addAction(__tr2qs_ctx("&Polygons","dcc"),polygons); - m_pMenuBar->insertItem(__tr2qs_ctx("&Insert","dcc"),add); + m_pMenuBar->addAction(__tr2qs_ctx("&Insert","dcc"),add); } DccCanvasWidget::~DccCanvasWidget() diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp index cbab328f7..1d4f838e3 100644 --- a/src/modules/editor/ScriptEditorImplementation.cpp +++ b/src/modules/editor/ScriptEditorImplementation.cpp @@ -795,11 +795,11 @@ ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par) b->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); g->addWidget(b,1,0); - KviTalPopupMenu * pop = new KviTalPopupMenu(b); - pop->insertItem(__tr2qs_ctx("&Open...","editor"),this,SLOT(loadFromFile())); - pop->insertItem(__tr2qs_ctx("&Save As...","editor"),this,SLOT(saveToFile())); - pop->insertSeparator(); - pop->insertItem(__tr2qs_ctx("&Configure Editor...","editor"),this,SLOT(configureColors())); + QMenu * pop = new QMenu(b); + pop->addAction(__tr2qs_ctx("&Open...","editor"),this,SLOT(loadFromFile())); + pop->addAction(__tr2qs_ctx("&Save As...","editor"),this,SLOT(saveToFile())); + pop->addSeparator(); + pop->addAction(__tr2qs_ctx("&Configure Editor...","editor"),this,SLOT(configureColors())); b->setMenu(pop); b->setPopupMode(QToolButton::InstantPopup); diff --git a/src/modules/editor/ScriptEditorImplementation.h b/src/modules/editor/ScriptEditorImplementation.h index 50fcb3ca6..ad3d064e9 100644 --- a/src/modules/editor/ScriptEditorImplementation.h +++ b/src/modules/editor/ScriptEditorImplementation.h @@ -28,7 +28,7 @@ #include "KviScriptEditor.h" #include "KviPointerList.h" #include "KviSelectors.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QCompleter> #include <QLabel> diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp index 7991f5c80..3ae064075 100644 --- a/src/modules/eventeditor/EventEditorWindow.cpp +++ b/src/modules/eventeditor/EventEditorWindow.cpp @@ -40,7 +40,7 @@ #include "KviFileDialog.h" #include "KviKvsEventManager.h" #include "KviTalVBox.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QMessageBox> #include <QSplitter> @@ -155,7 +155,7 @@ void EventEditor::oneTimeSetup() connect(m_pTreeWidget,SIGNAL(rightButtonPressed(QTreeWidgetItem *,QPoint)), this,SLOT(itemPressed(QTreeWidgetItem *,QPoint))); connect(KviKvsEventManager::instance(),SIGNAL(eventHandlerDisabled(const QString &)),this,SLOT(eventHandlerDisabled(const QString &))); - m_pContextPopup = new KviTalPopupMenu(this); + m_pContextPopup = new QMenu(this); m_pTreeWidget->sortItems(0,Qt::AscendingOrder); } void EventEditor::eventHandlerDisabled(const QString &szHandler) @@ -212,24 +212,24 @@ void EventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt) { QString tmp; if(!(((EventEditorHandlerTreeWidgetItem *)it)->m_bEnabled)) - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Handler)), __tr2qs_ctx("&Enable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled())); else - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::HandlerDisabled)), __tr2qs_ctx("&Disable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled())); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Quit)), __tr2qs_ctx("Re&move Handler","editor"), this,SLOT(removeCurrentHandler())); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("&Export Handler To...","editor"), this,SLOT(exportCurrentHandler())); } else { - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Handler)), __tr2qs_ctx("&New Handler","editor"), this,SLOT(addHandlerForCurrentEvent())); diff --git a/src/modules/eventeditor/EventEditorWindow.h b/src/modules/eventeditor/EventEditorWindow.h index 88451e4a8..ae51e2cb7 100644 --- a/src/modules/eventeditor/EventEditorWindow.h +++ b/src/modules/eventeditor/EventEditorWindow.h @@ -26,7 +26,7 @@ #include "KviWindow.h" #include "KviCString.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QWidget> #include <QLineEdit> @@ -90,7 +90,7 @@ public: KviScriptEditor * m_pEditor; EventEditorTreeWidget * m_pTreeWidget; QLineEdit * m_pNameEditor; - KviTalPopupMenu * m_pContextPopup; + QMenu * m_pContextPopup; EventEditorHandlerTreeWidgetItem * m_pLastEditedItem; bool m_bOneTimeSetupDone; public: diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp index 00a9c2aa5..2693e39f7 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.cpp +++ b/src/modules/filetransferwindow/FileTransferWindow.cpp @@ -48,7 +48,7 @@ #include <QFontMetrics> #include <QEvent> #include <QKeyEvent> - +#include <QWidgetAction> #include <QHeaderView> #ifdef COMPILE_KDE_SUPPORT @@ -386,17 +386,17 @@ void FileTransferWindow::doubleClicked(FileTransferItem *it,const QPoint &) void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &pnt) { - if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this); - if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this); + if(!m_pContextPopup)m_pContextPopup = new QMenu(this); + if(!m_pLocalFilePopup)m_pLocalFilePopup = new QMenu(this); if(!m_pOpenFilePopup) { - m_pOpenFilePopup= new KviTalPopupMenu(this); + m_pOpenFilePopup= new QMenu(this); connect(m_pOpenFilePopup,SIGNAL(activated(int)),this,SLOT(openFilePopupActivated(int))); } m_pContextPopup->clear(); - int id; + QAction *pAction; if(it) { @@ -430,13 +430,13 @@ void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &p QLabel * l = new QLabel(tmp,m_pLocalFilePopup); QPalette p; l->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name()); - m_pLocalFilePopup->insertItem(l); + m_pLocalFilePopup->addAction(new QWidgetAction(l)); #ifdef COMPILE_KDE_SUPPORT QString mimetype = KMimeType::findByPath(szFile)->name(); KService::List offers = KMimeTypeTrader::self()->query(mimetype,"Application"); - id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,SLOT(openLocalFile())); + id = m_pLocalFilePopup->addAction(__tr2qs_ctx("&Open","filetransferwindow"),this,SLOT(openLocalFile())); m_pLocalFilePopup->setItemParameter(id,-1); m_pOpenFilePopup->clear(); @@ -447,7 +447,7 @@ void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &p for(KService::List::Iterator itOffers = offers.begin(); itOffers != offers.end(); ++itOffers) { - id = m_pOpenFilePopup->insertItem( + id = m_pOpenFilePopup->addAction( SmallIcon((*itOffers).data()->icon()), (*itOffers).data()->name() ); @@ -455,42 +455,41 @@ void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &p idx++; } - m_pOpenFilePopup->insertSeparator(); + m_pOpenFilePopup->addSeparator(); - id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("&Other...","filetransferwindow"),this,SLOT(openLocalFileWith())); + id = m_pOpenFilePopup->addAction(__tr2qs_ctx("&Other...","filetransferwindow"),this,SLOT(openLocalFileWith())); m_pOpenFilePopup->setItemParameter(id,-1); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &With","filetransferwindow"),m_pOpenFilePopup); - m_pLocalFilePopup->insertSeparator(); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,SLOT(openLocalFileFolder())); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Terminal at Location","filetransferwindow"),this,SLOT(openLocalFileTerminal())); - m_pLocalFilePopup->insertSeparator(); + m_pLocalFilePopup->addAction(__tr2qs_ctx("Open &With","filetransferwindow"),m_pOpenFilePopup); + m_pLocalFilePopup->addSeparator(); + m_pLocalFilePopup->addAction(__tr2qs_ctx("Open &Location","filetransferwindow"),this,SLOT(openLocalFileFolder())); + m_pLocalFilePopup->addAction(__tr2qs_ctx("Terminal at Location","filetransferwindow"),this,SLOT(openLocalFileTerminal())); + m_pLocalFilePopup->addSeparator(); #endif //COMPILE_KDE_SUPPORT //-| Grifisx & Noldor |- #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,SLOT(openLocalFile())); + id = m_pLocalFilePopup->addAction(__tr2qs_ctx("&Open","filetransferwindow"),this,SLOT(openLocalFile())); m_pLocalFilePopup->setItemParameter(id,-1); - m_pOpenFilePopup->insertSeparator(); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &With","filetransferwindow"),this,SLOT(openLocalFileWith())); - m_pLocalFilePopup->insertSeparator(); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,SLOT(openLocalFileFolder())); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("MS-DOS Prompt at Location","filetransferwindow"),this,SLOT(openLocalFileTerminal())); - m_pLocalFilePopup->insertSeparator(); + m_pOpenFilePopup->addSeparator(); + m_pLocalFilePopup->addAction(__tr2qs_ctx("Open &With","filetransferwindow"),this,SLOT(openLocalFileWith())); + m_pLocalFilePopup->addSeparator(); + m_pLocalFilePopup->addAction(__tr2qs_ctx("Open &Location","filetransferwindow"),this,SLOT(openLocalFileFolder())); + m_pLocalFilePopup->addAction(__tr2qs_ctx("MS-DOS Prompt at Location","filetransferwindow"),this,SLOT(openLocalFileTerminal())); + m_pLocalFilePopup->addSeparator(); #endif // G&N end - m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Copy Path to Clipboard","filetransferwindow"),this,SLOT(copyLocalFileToClipboard())); - - id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Delete file","filetransferwindow"),this,SLOT(deleteLocalFile())); - m_pLocalFilePopup->setItemEnabled(id,i->transfer()->terminated()); - m_pContextPopup->insertItem(__tr2qs_ctx("Local &File","filetransferwindow"),m_pLocalFilePopup); - + m_pLocalFilePopup->addAction(__tr2qs_ctx("&Copy Path to Clipboard","filetransferwindow"),this,SLOT(copyLocalFileToClipboard())); + pAction = m_pLocalFilePopup->addAction(__tr2qs_ctx("&Delete file","filetransferwindow"),this,SLOT(deleteLocalFile())); + pAction->setEnabled(i->transfer()->terminated()); + pAction = m_pContextPopup->addAction(__tr2qs_ctx("Local &File","filetransferwindow")); + pAction->setMenu(m_pLocalFilePopup); } i->transfer()->fillContextPopup(m_pContextPopup); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); } } @@ -512,15 +511,15 @@ void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &p } } - id = m_pContextPopup->insertItem(__tr2qs_ctx("&Clear Terminated","filetransferwindow"),this,SLOT(clearTerminated())); - m_pContextPopup->setItemEnabled(id,bHaveTerminated); + pAction = m_pContextPopup->addAction(__tr2qs_ctx("&Clear Terminated","filetransferwindow"),this,SLOT(clearTerminated())); + pAction->setEnabled(bHaveTerminated); bool bAreTransfersActive = false; if(m_pTableWidget->rowCount() >= 1) bAreTransfersActive = true; - id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear &All","filetransferwindow"),this,SLOT(clearAll())); - m_pContextPopup->setItemEnabled(id,bAreTransfersActive); + pAction = m_pContextPopup->addAction(__tr2qs_ctx("Clear &All","filetransferwindow"),this,SLOT(clearAll())); + pAction->setEnabled(bAreTransfersActive); m_pContextPopup->popup(pnt); } diff --git a/src/modules/filetransferwindow/FileTransferWindow.h b/src/modules/filetransferwindow/FileTransferWindow.h index 9fadaba19..3588439e7 100644 --- a/src/modules/filetransferwindow/FileTransferWindow.h +++ b/src/modules/filetransferwindow/FileTransferWindow.h @@ -33,7 +33,7 @@ #include "KviFileTransfer.h" #include "KviDynamicToolTip.h" #include "KviTalTableWidget.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviTalIconAndRichTextItemDelegate.h" #include <QTimer> @@ -97,9 +97,9 @@ protected: QSplitter * m_pVertSplitter; FileTransferWidget * m_pTableWidget; QAbstractItemDelegate * m_pItemDelegate; - KviTalPopupMenu * m_pContextPopup; - KviTalPopupMenu * m_pLocalFilePopup; - KviTalPopupMenu * m_pOpenFilePopup; + QMenu * m_pContextPopup; + QMenu * m_pLocalFilePopup; + QMenu * m_pOpenFilePopup; QTimer * m_pTimer; int m_iLineSpacing; // cached fm value public: // Methods diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp index 2e63b1aa1..9a45e500b 100644 --- a/src/modules/http/HttpFileTransfer.cpp +++ b/src/modules/http/HttpFileTransfer.cpp @@ -33,7 +33,7 @@ #include "KviKvsEventTriggers.h" #include "KviConsoleWindow.h" #include "KviKvsScript.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QPainter> @@ -98,10 +98,11 @@ void HttpFileTransfer::abort() m_pHttpRequest->abort(); } -void HttpFileTransfer::fillContextPopup(KviTalPopupMenu * m) +void HttpFileTransfer::fillContextPopup(QMenu * m) { - int id = m->insertItem(__tr2qs_ctx("Abort","http"),this,SLOT(abort())); - if(!active())m->setItemEnabled(id,false); + QAction *pAction = m->addAction(__tr2qs_ctx("Abort","http"),this,SLOT(abort())); + if(!active()) + pAction->setEnabled(false); } bool HttpFileTransfer::active() diff --git a/src/modules/http/HttpFileTransfer.h b/src/modules/http/HttpFileTransfer.h index b89c465b9..6f731be40 100644 --- a/src/modules/http/HttpFileTransfer.h +++ b/src/modules/http/HttpFileTransfer.h @@ -33,7 +33,7 @@ #include <QTimer> class QPainter; -class KviTalPopupMenu; +class QMenu; class HttpFileTransfer : public KviFileTransfer { @@ -78,7 +78,7 @@ public: virtual void displayPaint(QPainter * p,int column, QRect rect); virtual int displayHeight(int iLineSpacing); - virtual void fillContextPopup(KviTalPopupMenu * m); + virtual void fillContextPopup(QMenu * m); virtual bool active(); virtual QString tipText(); virtual QString localFileName(); diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp index 9e0573401..21ccf2f5b 100644 --- a/src/modules/links/LinksWindow.cpp +++ b/src/modules/links/LinksWindow.cpp @@ -88,8 +88,8 @@ LinksWindow::LinksWindow(KviConsoleWindow * lpConsole) m_pLinkList = new KviPointerList<KviLink>; m_pLinkList->setAutoDelete(true); - m_pHostPopup = new KviTalPopupMenu(); - connect(m_pHostPopup,SIGNAL(activated(int)),this,SLOT(hostPopupClicked(int))); + m_pHostPopup = new QMenu(); + connect(m_pHostPopup,SIGNAL(triggered(QAction*)),this,SLOT(hostPopupClicked(QAction *))); connectionStateChange(); @@ -360,53 +360,53 @@ 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(KviIconManager::Links)),tmp.ptr()); - m_pHostPopup->insertSeparator(); + m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Links)),tmp.ptr()); + m_pHostPopup->addSeparator(); tmp.sprintf("TIME %s",host.ptr()); - m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),tmp.ptr()); + m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),tmp.ptr()); tmp.sprintf("ADMIN %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("INFO %s",host.ptr()); - m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::ServerInfo)),tmp.ptr()); + m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::ServerInfo)),tmp.ptr()); tmp.sprintf("MOTD %s",host.ptr()); - m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Motd)),tmp.ptr()); + m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Motd)),tmp.ptr()); tmp.sprintf("VERSION %s",host.ptr()); - m_pHostPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::KVIrc)),tmp.ptr()); + m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::KVIrc)),tmp.ptr()); tmp.sprintf("TRACE %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("USERS %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); - m_pHostPopup->insertSeparator(); + m_pHostPopup->addAction(tmp.ptr()); + m_pHostPopup->addSeparator(); tmp.sprintf("STATS c %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS d %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS h %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS i %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS k %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS l %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS m %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS o %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS t %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS u %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS y %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); tmp.sprintf("STATS z %s",host.ptr()); - m_pHostPopup->insertItem(tmp.ptr()); + m_pHostPopup->addAction(tmp.ptr()); m_pHostPopup->popup(p); } -void LinksWindow::hostPopupClicked(int id) +void LinksWindow::hostPopupClicked(QAction *pAction) { - KviCString tmp = m_pHostPopup->text(id); + KviCString tmp = pAction->text(); if(tmp.hasData()) { if(!connection())output(KVI_OUT_SYSTEMERROR,__tr2qs("You're not connected to a server")); diff --git a/src/modules/links/LinksWindow.h b/src/modules/links/LinksWindow.h index 89c35b05e..45b4d8e87 100644 --- a/src/modules/links/LinksWindow.h +++ b/src/modules/links/LinksWindow.h @@ -30,7 +30,7 @@ #include "KviIrcServerParser.h" #include "KviConsoleWindow.h" #include "KviIrcContext.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviThemedTreeWidget.h" #include <QToolButton> @@ -68,7 +68,7 @@ protected: QSplitter * m_pTopSplitter; LinksListView * m_pListView; KviPointerList<KviLink> * m_pLinkList; - KviTalPopupMenu * m_pHostPopup; + QMenu * m_pHostPopup; QString m_szRootServer; QToolButton * m_pRequestButton; KviThemedLabel * m_pInfoLabel; @@ -84,7 +84,7 @@ protected: virtual void getBaseLogFileName(QString &buffer); protected slots: void showHostPopup(QTreeWidgetItem *i,const QPoint &p); - void hostPopupClicked(int id); + void hostPopupClicked(QAction *pAction); void requestLinks(); void connectionStateChange(); public: diff --git a/src/modules/list/ListWindow.h b/src/modules/list/ListWindow.h index 2c77e0453..edc0c190b 100644 --- a/src/modules/list/ListWindow.h +++ b/src/modules/list/ListWindow.h @@ -31,7 +31,7 @@ #include "KviIrcServerParser.h" #include "KviConsoleWindow.h" #include "KviIrcContext.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviThemedTreeWidget.h" #include <QToolButton> diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp index 36dd8fcb4..c4c492e6a 100644 --- a/src/modules/logview/LogViewWindow.cpp +++ b/src/modules/logview/LogViewWindow.cpp @@ -37,7 +37,7 @@ #include "KviQString.h" #include "KviApplication.h" #include "KviFileUtils.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviControlCodes.h" #include <QList> @@ -186,11 +186,11 @@ LogViewWindow::LogViewWindow(KviModuleExtensionDescriptor * pDesc) li.append(width()-110); m_pSplitter->setSizes(li); - m_pExportLogPopup = new KviTalPopupMenu(this,"exportlog"); - m_pExportLogPopup->insertItem(__tr2qs_ctx("plain text file","log")); - m_pExportLogPopup->insertItem(__tr2qs_ctx("HTML archive","log")); - //m_pExportLogPopup->insertItem(__tr2qs_ctx("XML file","log")); - //m_pExportLogPopup->insertItem(__tr2qs_ctx("database file","log")); + m_pExportLogPopup = new QMenu("exportlog", this); + m_pExportLogPopup->addAction(__tr2qs_ctx("plain text file","log")); + m_pExportLogPopup->addAction(__tr2qs_ctx("HTML archive","log")); + //m_pExportLogPopup->addAction(__tr2qs_ctx("XML file","log")); + //m_pExportLogPopup->addAction(__tr2qs_ctx("database file","log")); connect(m_pExportLogPopup,SIGNAL(activated(int)),this,SLOT(exportLog(int))); m_pTimer = new QTimer(this); @@ -433,14 +433,14 @@ void LogViewWindow::rightButtonClicked(QTreeWidgetItem * pItem, const QPoint &) return; m_pListView->setCurrentItem(pItem); - KviTalPopupMenu * pPopup = new KviTalPopupMenu(this); + QMenu * pPopup = new QMenu(this); if(((LogListViewItem *)pItem)->childCount()) { - //pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::UserList)),__tr2qs_ctx("Export all log files to","log"),m_pExportLogPopup); - pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove all log files within this folder","log"),this,SLOT(deleteCurrent())); + //pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::UserList)),__tr2qs_ctx("Export all log files to","log"),m_pExportLogPopup); + pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove all log files within this folder","log"),this,SLOT(deleteCurrent())); } else { - pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::UserList)),__tr2qs_ctx("Export log file to","log"),m_pExportLogPopup); - pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove log file","log"),this,SLOT(deleteCurrent())); + pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::UserList)),__tr2qs_ctx("Export log file to","log"))->setMenu(m_pExportLogPopup); + pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove log file","log"),this,SLOT(deleteCurrent())); } pPopup->exec(QCursor::pos()); diff --git a/src/modules/logview/LogViewWindow.h b/src/modules/logview/LogViewWindow.h index 6255a0398..c62a43470 100644 --- a/src/modules/logview/LogViewWindow.h +++ b/src/modules/logview/LogViewWindow.h @@ -100,7 +100,7 @@ protected: QString m_szLastGroup; bool m_bAborted; QTimer * m_pTimer; - KviTalPopupMenu * m_pExportLogPopup; + QMenu * m_pExportLogPopup; public: /** * \brief Exports the log and creates the file in the selected format diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp index 651b2a77b..b6897ecac 100644 --- a/src/modules/notifier/NotifierWindow.cpp +++ b/src/modules/notifier/NotifierWindow.cpp @@ -953,9 +953,9 @@ void NotifierWindow::contextPopup(const QPoint & pos) { if(!m_pContextPopup) { - m_pContextPopup = new KviTalPopupMenu(this); + m_pContextPopup = new QMenu(this); connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(fillContextPopup())); - m_pDisablePopup = new KviTalPopupMenu(this); + m_pDisablePopup = new QMenu(this); } m_pContextPopup->popup(pos); @@ -964,20 +964,20 @@ void NotifierWindow::contextPopup(const QPoint & pos) void NotifierWindow::fillContextPopup() { m_pContextPopup->clear(); - 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_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Editor)),__tr2qs_ctx("Show/Hide input line","notifier"),this,SLOT(toggleLineEdit())); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Close)),__tr2qs_ctx("Hide","notifier"),this,SLOT(hideNow())); + m_pContextPopup->addSeparator(); m_pDisablePopup->clear(); - 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(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_pDisablePopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),__tr2qs_ctx("1 Minute","notifier"),this,SLOT(disableFor1Minute())); + m_pDisablePopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),__tr2qs_ctx("5 Minutes","notifier"),this,SLOT(disableFor5Minutes())); + m_pDisablePopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),__tr2qs_ctx("15 Minutes","notifier"),this,SLOT(disableFor15Minutes())); + m_pDisablePopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),__tr2qs_ctx("30 Minutes","notifier"),this,SLOT(disableFor30Minutes())); + m_pDisablePopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),__tr2qs_ctx("1 Hour","notifier"),this,SLOT(disableFor60Minutes())); + m_pDisablePopup->addSeparator(); + m_pDisablePopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,SLOT(disableUntilKVIrcRestarted())); + m_pDisablePopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,SLOT(disablePermanently())); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Disable","notifier"))->setMenu(m_pDisablePopup); } void NotifierWindow::disableFor15Minutes() diff --git a/src/modules/notifier/NotifierWindow.h b/src/modules/notifier/NotifierWindow.h index d58cde2ae..87f67c9b4 100644 --- a/src/modules/notifier/NotifierWindow.h +++ b/src/modules/notifier/NotifierWindow.h @@ -30,7 +30,7 @@ #include "kvi_settings.h" #include "KviQString.h" #include "KviPointerList.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviTimeUtils.h" #include <QBitmap> @@ -90,8 +90,8 @@ protected: QPoint m_pntPos; QPoint m_pntClick; int m_iBlinkCount; - KviTalPopupMenu * m_pContextPopup; - KviTalPopupMenu * m_pDisablePopup; + QMenu * m_pContextPopup; + QMenu * m_pDisablePopup; KviWindow * m_pWindowToRaise; kvi_time_t m_tAutoHideAt; kvi_time_t m_tStartedAt; diff --git a/src/modules/objects/KvsObject_comboBox.cpp b/src/modules/objects/KvsObject_comboBox.cpp index 8951e4200..9cd49b01c 100644 --- a/src/modules/objects/KvsObject_comboBox.cpp +++ b/src/modules/objects/KvsObject_comboBox.cpp @@ -49,7 +49,7 @@ [class]widget[/class] @description: @functions: - !fn: $insertItem(<text:string>, <index:int>) + !fn: $addAction(<text:string>, <index:int>) Inserts a text item at position <index>. If index is negative or not specified the item is appended. !fn: $changeItem(<text:string>, <index:uint>) @@ -99,7 +99,7 @@ */ KVSO_BEGIN_REGISTERCLASS(KvsObject_comboBox,"combobox","widget") - KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,insertItem) + KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,addAction) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,changeItem) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,removeItem) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,clear) @@ -139,7 +139,7 @@ bool KvsObject_comboBox::init(KviKvsRunTimeContext *,KviKvsVariantList *) return true; } -KVSO_CLASS_FUNCTION(comboBox,insertItem) +KVSO_CLASS_FUNCTION(comboBox,addAction) { CHECK_INTERNAL_POINTER(widget()) kvs_int_t iIndex; @@ -151,7 +151,7 @@ KVSO_CLASS_FUNCTION(comboBox,insertItem) if(c->paramCount()==1) ((QComboBox *)widget())->addItem(szItem); else - ((QComboBox *)widget())->insertItem( iIndex,szItem); + ((QComboBox *)widget())->insertItem( iIndex,szItem); return true; } KVSO_CLASS_FUNCTION(comboBox,clear) diff --git a/src/modules/objects/KvsObject_comboBox.h b/src/modules/objects/KvsObject_comboBox.h index a10ac6c29..c9aa9a382 100644 --- a/src/modules/objects/KvsObject_comboBox.h +++ b/src/modules/objects/KvsObject_comboBox.h @@ -41,7 +41,7 @@ public: protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - bool insertItem(KviKvsObjectFunctionCall *c); + bool addAction(KviKvsObjectFunctionCall *c); bool changeItem(KviKvsObjectFunctionCall *c); bool removeItem(KviKvsObjectFunctionCall *c); bool clear(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp index 081627caa..7570a3b11 100644 --- a/src/modules/objects/KvsObject_listWidget.cpp +++ b/src/modules/objects/KvsObject_listWidget.cpp @@ -106,7 +106,7 @@ const char * const itemflags_tbl[] = { Returns '1' if the eventual item check box is checked, '0' otherwise.[br] !fn: <string> $selectionMode() Returns the current selection mode - !fn: $insertItem(<text:string>, <index:uint>) + !fn: $addAction(<text:string>, <index:uint>) Inserts a text item at position <index>. If index is negative or not specified the item is appended. !fn: $changeItem(<text:string>, <index:uint>) @@ -156,7 +156,7 @@ const char * const itemflags_tbl[] = { KVSO_BEGIN_REGISTERCLASS(KvsObject_listWidget,"listbox","widget") - KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,insertItem) + KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,addAction) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,insertWidgetItem) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,changeItem) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,removeItem) @@ -214,7 +214,7 @@ bool KvsObject_listWidget::init(KviKvsRunTimeContext *,KviKvsVariantList *) return true; } -KVSO_CLASS_FUNCTION(listWidget,insertItem) +KVSO_CLASS_FUNCTION(listWidget,addAction) { CHECK_INTERNAL_POINTER(widget()) kvs_int_t iRow; @@ -223,7 +223,7 @@ KVSO_CLASS_FUNCTION(listWidget,insertItem) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETER("index",KVS_PT_INT,KVS_PF_OPTIONAL,iRow) KVSO_PARAMETERS_END(c) - if (c->parameterCount()==2) ((QListWidget *)widget())->insertItem(iRow, szText); + if (c->parameterCount()==2) ((QListWidget *)widget())->insertItem(iRow, szText); else ((QListWidget *)widget())->addItem(szText); return true; } diff --git a/src/modules/objects/KvsObject_listWidget.h b/src/modules/objects/KvsObject_listWidget.h index 72cfdd043..79031639c 100644 --- a/src/modules/objects/KvsObject_listWidget.h +++ b/src/modules/objects/KvsObject_listWidget.h @@ -40,7 +40,7 @@ protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - bool insertItem(KviKvsObjectFunctionCall *c); + bool addAction(KviKvsObjectFunctionCall *c); bool changeItem(KviKvsObjectFunctionCall *c); bool removeItem(KviKvsObjectFunctionCall *c); bool count(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/KvsObject_menuBar.cpp b/src/modules/objects/KvsObject_menuBar.cpp index 0a9904b2a..69c2257fc 100644 --- a/src/modules/objects/KvsObject_menuBar.cpp +++ b/src/modules/objects/KvsObject_menuBar.cpp @@ -42,12 +42,12 @@ @description: @functions: - !fn: <integer> $insertItem(<text:string>) + !fn: <integer> $addAction(<text:string>) Returns an integer that identifies the inserted item. */ KVSO_BEGIN_REGISTERCLASS(KvsObject_menuBar,"menubar","widget") - KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_menuBar,insertItem) + KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_menuBar,addAction) KVSO_END_REGISTERCLASS(KvsObject_menuBar) KVSO_BEGIN_CONSTRUCTOR(KvsObject_menuBar,KvsObject_widget) @@ -65,7 +65,7 @@ bool KvsObject_menuBar::init(KviKvsRunTimeContext *,KviKvsVariantList *) return true; } -KVSO_CLASS_FUNCTION(menuBar,insertItem) +KVSO_CLASS_FUNCTION(menuBar,addAction) { CHECK_INTERNAL_POINTER(widget()) QString szItem; diff --git a/src/modules/objects/KvsObject_menuBar.h b/src/modules/objects/KvsObject_menuBar.h index 32516f58b..820491a18 100644 --- a/src/modules/objects/KvsObject_menuBar.h +++ b/src/modules/objects/KvsObject_menuBar.h @@ -37,6 +37,6 @@ public: protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - bool insertItem(KviKvsObjectFunctionCall *c); + bool addAction(KviKvsObjectFunctionCall *c); }; #endif // !_CLASS_MENUBAR_H_ diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp index dd03eb010..02be27d46 100644 --- a/src/modules/objects/KvsObject_popupMenu.cpp +++ b/src/modules/objects/KvsObject_popupMenu.cpp @@ -30,7 +30,7 @@ #include "kvi_debug.h" #include "KviLocale.h" #include "KviIconManager.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QCursor> #include <QMenu> @@ -53,9 +53,9 @@ [class]widget[/class] @description: This widget can be used to display a popup menu.Technically, a popup menu consists of a list of menu items.[br] - You add items with insertItem(). An item is either a string. In addition, items can have an optional icon drawn on the very left side.[br] + You add items with addAction(). An item is either a string. In addition, items can have an optional icon drawn on the very left side.[br] @functions: - !fn: $insertItem(<text:string>,[icon_id:string]) + !fn: $addAction(<text:string>,[icon_id:string]) Inserts menu items into a popup menu with optional icon and return the popup identifier. !fn: $addMenu(<popupmenu:hobject,[idx:uinteger]) Add a popupmenu. @@ -69,7 +69,7 @@ Removes the menu item that has the identifier id. !fn: $removeItemAt(<index:uinteger>) Removes the menu item at position index. - !fn: $insertSeparator(<index:uinteger>) + !fn: $addSeparator(<index:uinteger>) Inserts a separator at position index.[br] If the index is negative the separator becomes the last menu item. !fn: $activatedEvent(<popup_id:uinteger>) @@ -92,11 +92,11 @@ constructor() { // we store the item's id for checkit in activatedEvent - @%tile_id=@$insertItem("Tile",118) - @%cascade_id=@$insertItem("Cascade",115) - @$insertSeparator(3) - @%closeactw_id=@$insertItem("Close Active Window",08) - @%closeallw_id=@$insertItem("Close All Window",58) + @%tile_id=@$addAction("Tile",118) + @%cascade_id=@$addAction("Cascade",115) + @$addSeparator(3) + @%closeactw_id=@$addAction("Close Active Window",08) + @%closeallw_id=@$addAction("Close All Window",58) } activatedEvent() { @@ -198,10 +198,10 @@ static void removeAction(int idx) KVSO_BEGIN_REGISTERCLASS(KvsObject_popupMenu,"popupmenu","widget") - KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,insertItem) + KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,addAction) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,setTitle) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,exec) - KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,insertSeparator) + KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,addSeparator) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,removeItem) KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,addMenu) @@ -229,7 +229,7 @@ bool KvsObject_popupMenu::init(KviKvsRunTimeContext *,KviKvsVariantList *) return true; } -KVSO_CLASS_FUNCTION(popupMenu,insertItem) +KVSO_CLASS_FUNCTION(popupMenu,addAction) { CHECK_INTERNAL_POINTER(widget()) QString szItem,szIcon; @@ -349,7 +349,7 @@ KVSO_CLASS_FUNCTION(popupMenu,removeItem) return true; } -KVSO_CLASS_FUNCTION(popupMenu,insertSeparator) +KVSO_CLASS_FUNCTION(popupMenu,addSeparator) { CHECK_INTERNAL_POINTER(widget()) kvs_uint_t iIndex; @@ -358,7 +358,7 @@ KVSO_CLASS_FUNCTION(popupMenu,insertSeparator) KVSO_PARAMETERS_END(c) QAction * pAction=getAction(iIndex); if(pAction) - ((QMenu *)widget())->insertSeparator(pAction); + ((QMenu *)widget())->insertSeparator(pAction); return true; } diff --git a/src/modules/objects/KvsObject_popupMenu.h b/src/modules/objects/KvsObject_popupMenu.h index ad0fc37c7..20c547d60 100644 --- a/src/modules/objects/KvsObject_popupMenu.h +++ b/src/modules/objects/KvsObject_popupMenu.h @@ -44,13 +44,13 @@ public: protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - bool insertItem(KviKvsObjectFunctionCall *c); + bool addAction(KviKvsObjectFunctionCall *c); bool setTitle(KviKvsObjectFunctionCall *c); bool addMenu(KviKvsObjectFunctionCall *c); bool exec(KviKvsObjectFunctionCall *c); bool removeItem(KviKvsObjectFunctionCall *c); bool removeItemAt(KviKvsObjectFunctionCall *c); - bool insertSeparator(KviKvsObjectFunctionCall *c); + bool addSeparator(KviKvsObjectFunctionCall *c); bool activatedEvent(KviKvsObjectFunctionCall *c); bool highlightedEvent(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp index 84d05560f..a37e8b0d8 100644 --- a/src/modules/objects/KvsObject_toolButton.cpp +++ b/src/modules/objects/KvsObject_toolButton.cpp @@ -29,7 +29,7 @@ #include "KviLocale.h" #include "KviIconManager.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" /* @doc: toolbutton @keyterms: @@ -273,7 +273,7 @@ KVSO_CLASS_FUNCTION(toolButton,setPopup) c->warning(__tr2qs_ctx("Can't add a non-popupmenu object","objects")); return true; } - ((QToolButton *)widget())->setMenu(((KviTalPopupMenu *)(ob->object()))); + ((QToolButton *)widget())->setMenu(((QMenu *)(ob->object()))); return true; } diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.h b/src/modules/objects/KvsObject_treeWidgeteItem.h index 14b81b6ce..98491f6a4 100644 --- a/src/modules/objects/KvsObject_treeWidgeteItem.h +++ b/src/modules/objects/KvsObject_treeWidgeteItem.h @@ -42,7 +42,7 @@ protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); protected: bool setText(KviKvsObjectFunctionCall *c); - bool insertItem(KviKvsObjectFunctionCall *c); + bool addAction(KviKvsObjectFunctionCall *c); bool setPixmap(KviKvsObjectFunctionCall *c); bool setItemEditable(KviKvsObjectFunctionCall *c); bool isItemEditable(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp index 6ba7529aa..a490f527a 100644 --- a/src/modules/objects/KvsObject_webView.cpp +++ b/src/modules/objects/KvsObject_webView.cpp @@ -30,7 +30,7 @@ #include "KvsObject_pixmap.h" #include "KviError.h" #include "KviLocale.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #if defined(COMPILE_WEBKIT_SUPPORT) #include <QWebView> @@ -1199,7 +1199,7 @@ KVSO_CLASS_FUNCTION(webView,appendWebViewActionToMenu) if (pix) pAction->setIcon(*pix); else c->warning(__tr2qs_ctx("Icon '%Q' doesn't exist","objects"),&szIcon); } - ((KviTalPopupMenu *)(ob->object()))->addAction(pAction); + ((QMenu *)(ob->object()))->addAction(pAction); return true; } diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp index e235515e6..7aca679ad 100644 --- a/src/modules/objects/KvsObject_widget.cpp +++ b/src/modules/objects/KvsObject_widget.cpp @@ -550,12 +550,12 @@ const char * const widgettypes_tbl[] = { %checkbox->$setText("This is a checkbox") %combobox = $new(combobox,%box) - %combobox->$insertItem("This is a combobox") - %combobox->$insertItem("This is a combobox's item") + %combobox->$addAction("This is a combobox") + %combobox->$addAction("This is a combobox's item") %listbox = $new(listbox,%box) - %listbox->$insertItem("This is a listbox item") - %listbox->$insertItem("This is another item") + %listbox->$addAction("This is a listbox item") + %listbox->$addAction("This is another item") %radiobutton = $new(radiobutton,%box) %radiobutton->$setText("This is a radiobutton") diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp index 24662c81c..20c4adcd3 100644 --- a/src/modules/options/OptionsDialog.cpp +++ b/src/modules/options/OptionsDialog.cpp @@ -34,7 +34,7 @@ #include "KviPointerHashTable.h" #include "KviTalVBox.h" #include "KviTalToolTip.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviTalGroupBox.h" #include <QLayout> diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp index 21db51a8a..b33de8197 100644 --- a/src/modules/options/OptionsWidget_channel.cpp +++ b/src/modules/options/OptionsWidget_channel.cpp @@ -112,7 +112,7 @@ OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent) hostmask.mask(tmp1,(KviIrcMask::MaskType)i); ipmask.mask(tmp2,(KviIrcMask::MaskType)i); - m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1, tmp2)); + m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1, tmp2)); } m_pBanTypeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintDefaultBanType)); diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp index cd4498f85..e79564221 100644 --- a/src/modules/options/OptionsWidget_identity.cpp +++ b/src/modules/options/OptionsWidget_identity.cpp @@ -351,7 +351,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren { QString tmp; tmp.setNum(i); - m_pAgeCombo->insertItem(m_pAgeCombo->count(),tmp); + m_pAgeCombo->insertItem(m_pAgeCombo->count(),tmp); } bool bOk; diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp index ed5c2b742..9ff8ddab3 100644 --- a/src/modules/options/OptionsWidget_message.cpp +++ b/src/modules/options/OptionsWidget_message.cpp @@ -39,6 +39,7 @@ #include <QPushButton> #include <QCursor> #include <QPainter> +#include <QWidgetAction> #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) #include <unistd.h> // symlink() @@ -398,10 +399,10 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent) m_pIconButton = new QToolButton(box); connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked())); - m_pIconPopup = new KviTalPopupMenu(this); + m_pIconPopup = new QMenu(this); KviIconWidget * iw = new KviIconWidget(m_pIconPopup); connect(iw,SIGNAL(selected(KviIconManager::SmallIcon)),this,SLOT(newIconSelected(KviIconManager::SmallIcon))); - m_pIconPopup->insertItem(iw); + m_pIconPopup->addAction(new QWidgetAction(iw)); m_pEnableLogging = new QCheckBox(__tr2qs_ctx("Log this","options"),box); diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h index c9e1bdee5..cf1b71c80 100644 --- a/src/modules/options/OptionsWidget_message.h +++ b/src/modules/options/OptionsWidget_message.h @@ -26,7 +26,7 @@ #include "KviOptionsWidget.h" #include "KviMessageTypeSettings.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviIconManager.h" #include <QTreeWidget> @@ -173,7 +173,7 @@ public: MessageListWidgetItem * m_pLastItem; QCheckBox * m_pEnableLogging; QToolButton * m_pIconButton; - KviTalPopupMenu * m_pIconPopup; + QMenu * m_pIconPopup; public: void saveLastItem(); protected slots: diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp index 8784e2a7b..3849db285 100644 --- a/src/modules/options/OptionsWidget_proxy.cpp +++ b/src/modules/options/OptionsWidget_proxy.cpp @@ -33,7 +33,7 @@ #include "kvi_settings.h" #include "KviOptions.h" #include "KviTalGroupBox.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviTalToolTip.h" #include <QLabel> @@ -140,7 +140,7 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent) layout()->setRowStretch(0,1); layout()->setColumnStretch(0,1); - m_pContextPopup = new KviTalPopupMenu(this); + m_pContextPopup = new QMenu(this); } OptionsWidget_proxy::~OptionsWidget_proxy() @@ -323,8 +323,9 @@ void OptionsWidget_proxy::customContextMenuRequested(const QPoint &pos) { QTreeWidgetItem *it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos); m_pContextPopup->clear(); - 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->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Proxy)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy())); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent())) + ->setEnabled(it); m_pContextPopup->popup(QCursor::pos()); } diff --git a/src/modules/options/OptionsWidget_proxy.h b/src/modules/options/OptionsWidget_proxy.h index 429bd7bf9..930cfda29 100644 --- a/src/modules/options/OptionsWidget_proxy.h +++ b/src/modules/options/OptionsWidget_proxy.h @@ -34,7 +34,7 @@ class QLabel; class QLineEdit; class QComboBox; class KviIpEditor; -class KviTalPopupMenu; +class QMenu; class KviProxy; class KviProxyDataBase; @@ -76,7 +76,7 @@ protected: QLineEdit * m_pPortEdit; QLabel * m_pProtocolLabel; QComboBox * m_pProtocolBox; - KviTalPopupMenu * m_pContextPopup; + QMenu * m_pContextPopup; QCheckBox * m_pIPv6Check; ProxyOptionsTreeWidgetItem * m_pLastEditedItem; private: diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index 154c937bf..1c75a72ee 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -53,7 +53,7 @@ #include "KviProxyDataBase.h" #include "KviKvsScript.h" #include "KviPointerHashTable.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviTalToolTip.h" #include <QLineEdit> @@ -230,8 +230,8 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n while(d->pcName) { tmp = QString("%1 (%2)").arg(d->pcName,d->pcDescription); - m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp); - m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp); + m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp); + m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp); if(KviQString::equalCI(d->pcName,n->encoding())) srvcurrent = i + 1; if(KviQString::equalCI(d->pcName,n->textEncoding())) @@ -786,8 +786,8 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) while(d->pcName) { tmp = QString("%1 (%2)").arg(d->pcName,d->pcDescription); - m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp); - m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp); + m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp); + m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp); if(KviQString::equalCI(d->pcName,s->encoding())) srvcurrent = i + 1; if(KviQString::equalCI(d->pcName,s->textEncoding())) @@ -815,7 +815,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) KviPointerList<KviProxy> * proxylist = g_pProxyDataBase->proxyList(); for(KviProxy * p = proxylist->first();p;p = proxylist->next()) { - m_pProxyEditor->insertItem(m_pProxyEditor->count(),QString("%1:%2").arg(p->hostName()).arg(p->port())); + m_pProxyEditor->insertItem(m_pProxyEditor->count(),QString("%1:%2").arg(p->hostName()).arg(p->port())); } if(m_pProxyEditor->count() > (s->proxy()+2)) m_pProxyEditor->setCurrentIndex(s->proxy()+2); @@ -1258,11 +1258,11 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) createLayout(); - m_pContextPopup = new KviTalPopupMenu(this); - m_pImportPopup = new KviTalPopupMenu(this); + m_pContextPopup = new QMenu(this); + m_pImportPopup = new QMenu(this); connect(m_pImportPopup,SIGNAL(aboutToShow()),this,SLOT(importPopupAboutToShow())); - connect(m_pImportPopup,SIGNAL(activated(int)),this,SLOT(importPopupActivated(int))); + connect(m_pImportPopup,SIGNAL(triggered(QAction *)),this,SLOT(importPopupActivated(QAction *))); m_pServerDetailsDialog = 0; m_pNetworkDetailsDialog = 0; @@ -1371,9 +1371,9 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) connect(m_pDetailsButton,SIGNAL(clicked()),this,SLOT(detailsClicked())); KviTalToolTip::add(m_pDetailsButton,__tr2qs_ctx("<center>Click here to edit advanced options for this entry</center>","options")); - m_pRecentPopup = new KviTalPopupMenu(gbox); + m_pRecentPopup = new QMenu(gbox); connect(m_pRecentPopup,SIGNAL(aboutToShow()),this,SLOT(recentServersPopupAboutToShow())); - connect(m_pRecentPopup,SIGNAL(activated(int)),this,SLOT(recentServersPopupClicked(int))); + connect(m_pRecentPopup,SIGNAL(triggered(QAction *)),this,SLOT(recentServersPopupClicked(QAction *))); QToolButton * tb = new QToolButton(gbox); tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Time)))); @@ -1479,11 +1479,11 @@ void OptionsWidget_servers::recentServersPopupAboutToShow() { g_pApp->fillRecentServersPopup(m_pRecentPopup); - m_pRecentPopup->insertSeparator(); - m_pRecentPopup->insertItem(__tr2qs("Clear Recent Servers List")); + m_pRecentPopup->addSeparator(); + m_pRecentPopup->addAction(__tr2qs("Clear Recent Servers List")); } -void OptionsWidget_servers::recentServersPopupClicked(int id) +void OptionsWidget_servers::recentServersPopupClicked(QAction *pAction) { if(!g_pActiveWindow) return; // doh @@ -1492,7 +1492,7 @@ void OptionsWidget_servers::recentServersPopupClicked(int id) if(!c) return; - QString szItemText = m_pRecentPopup->text(id); + QString szItemText = pAction->text(); szItemText.remove(QChar('&')); if(szItemText.isEmpty()) return; @@ -1798,27 +1798,26 @@ void OptionsWidget_servers::commit() void OptionsWidget_servers::customContextMenuRequested(const QPoint &pnt) { - int id; QTreeWidgetItem *it=(QTreeWidgetItem *) m_pTreeWidget->itemAt(pnt); bool bServer = (it && ((IrcServerOptionsTreeWidgetItem *)it)->m_pServerData); m_pContextPopup->clear(); - 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(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(KviIconManager::Copy)),__tr2qs_ctx("&Copy Server","options"),this,SLOT(copyServer())); - m_pContextPopup->setItemEnabled(id,bServer); - 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->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::World)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork())); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent())) + ->setEnabled(!bServer); + m_pContextPopup->addSeparator(); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Server)),__tr2qs_ctx("&New Server","options"),this,SLOT(newServer())); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Re&move Server","options"),this,SLOT(removeCurrent())) + ->setEnabled(bServer); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Copy)),__tr2qs_ctx("&Copy Server","options"),this,SLOT(copyServer())); + m_pContextPopup->setEnabled(bServer); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Paste)),__tr2qs_ctx("&Paste Server","options"),this,SLOT(pasteServer())) + ->setEnabled(m_pClipboard); - m_pContextPopup->insertSeparator(); - // m_pContextPopup->insertItem(__c2q(__tr("Merge list from server.ini","options")),this,SLOT(importFromIni())); - m_pContextPopup->insertItem(__tr2qs_ctx("Clear List","options"),this,SLOT(clearList())); - m_pContextPopup->insertSeparator(); - m_pContextPopup->insertItem(__tr2qs_ctx("Import List","options"),m_pImportPopup); + m_pContextPopup->addSeparator(); + // m_pContextPopup->addAction(__c2q(__tr("Merge list from server.ini","options")),this,SLOT(importFromIni())); + m_pContextPopup->addAction(__tr2qs_ctx("Clear List","options"),this,SLOT(clearList())); + m_pContextPopup->addSeparator(); + m_pContextPopup->addAction(__tr2qs_ctx("Import List","options"))->setMenu(m_pImportPopup); m_pContextPopup->popup(QCursor::pos()); } @@ -1831,19 +1830,19 @@ void OptionsWidget_servers::importPopupAboutToShow() if(!l)return; - int id; + QAction *pAction; for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next()) { if(d->icon()) - id = m_pImportPopup->insertItem(*(d->icon()),d->visibleName()); + pAction = m_pImportPopup->addAction(*(d->icon()),d->visibleName()); else - id = m_pImportPopup->insertItem(d->visibleName()); - m_pImportPopup->setItemParameter(id,d->id()); + pAction = m_pImportPopup->addAction(d->visibleName()); + pAction->setData(d->id()); } } -void OptionsWidget_servers::importPopupActivated(int id) +void OptionsWidget_servers::importPopupActivated(QAction *pAction) { // ensure that we have all the modules : they could have been unloaded while the popup was displayed g_pModuleManager->loadModulesByCaps("serverimport"); @@ -1866,7 +1865,10 @@ void OptionsWidget_servers::importPopupActivated(int id) m_pImportFilter = 0; } - id = m_pImportPopup->itemParameter(id); + bool bOk=false; + int id = pAction->data().toInt(&bOk); + if(!bOk) + return; m_pImportFilter = (KviMexServerImport *)KviModuleExtensionManager::instance()->allocateExtension("serverimport",id,0); diff --git a/src/modules/options/OptionsWidget_servers.h b/src/modules/options/OptionsWidget_servers.h index f1a40e731..c23851ded 100644 --- a/src/modules/options/OptionsWidget_servers.h +++ b/src/modules/options/OptionsWidget_servers.h @@ -40,7 +40,7 @@ class QComboBox; class QPushButton; class KviIpEditor; class KviIrcServer; -class KviTalPopupMenu; +class QMenu; class KviScriptEditor; class KviNickServRule; class NickServRuleEditor; @@ -182,9 +182,9 @@ protected: QLabel * m_pFilterLabel; QLineEdit * m_pFilterEdit; QPushButton * m_pDetailsButton; - KviTalPopupMenu * m_pRecentPopup; - KviTalPopupMenu * m_pContextPopup; - KviTalPopupMenu * m_pImportPopup; + QMenu * m_pRecentPopup; + QMenu * m_pContextPopup; + QMenu * m_pImportPopup; KviIrcServer * m_pClipboard; QPushButton * m_pConnectCurrent; QPushButton * m_pConnectNew; @@ -222,8 +222,8 @@ protected slots: void detailsClicked(); void connectCurrentClicked(); void recentServersPopupAboutToShow(); - void recentServersPopupClicked(int id); - void importPopupActivated(int id); + void recentServersPopupClicked(QAction *pAction); + void importPopupActivated(QAction *pAction); void serverNetworkEditTextEdited(const QString &szNewText); void filterTextEdited(const QString &szNewText); public: diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp index 454d39fca..533303284 100644 --- a/src/modules/options/OptionsWidget_sound.cpp +++ b/src/modules/options/OptionsWidget_sound.cpp @@ -108,7 +108,7 @@ OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent) { if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding))) iMatch = i + 1; - m_pTagsEncodingCombo->insertItem(m_pTagsEncodingCombo->count(),d->pcName); + m_pTagsEncodingCombo->insertItem(m_pTagsEncodingCombo->count(),d->pcName); i++; d = KviLocale::instance()->encodingDescription(i); } @@ -132,7 +132,7 @@ OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent) { if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringWinampTextEncoding))) iMatch = i + 1; - m_pWinampEncodingCombo->insertItem(m_pWinampEncodingCombo->count(),d->pcName); + m_pWinampEncodingCombo->addAction(m_pWinampEncodingCombo->count(),d->pcName); i++; d = KviLocale::instance()->encodingDescription(i); } diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp index dda641f9c..f87a5ebad 100644 --- a/src/modules/options/OptionsWidget_textEncoding.cpp +++ b/src/modules/options/OptionsWidget_textEncoding.cpp @@ -69,8 +69,8 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding))) iSrvMatch = i + 1; - m_pTextEncodingCombo->insertItem(m_pTextEncodingCombo->count(),d->pcName); - m_pSrvEncodingCombo->insertItem(m_pSrvEncodingCombo->count(),d->pcName); + m_pTextEncodingCombo->insertItem(m_pTextEncodingCombo->count(),d->pcName); + m_pSrvEncodingCombo->insertItem(m_pSrvEncodingCombo->count(),d->pcName); i++; d = KviLocale::instance()->encodingDescription(i); } @@ -113,7 +113,7 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) QString szTmp=*it; szTmp.replace("kvirc_",""); szTmp.replace(".mo",""); - m_pForcedLocaleCombo->insertItem(m_pForcedLocaleCombo->count(),szTmp); + m_pForcedLocaleCombo->insertItem(m_pForcedLocaleCombo->count(),szTmp); if(KviQString::equalCI(szTmp,m_szLanguage)) iMatch = i + 2; i++; diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index e933d33b4..6e3dacf6b 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -32,7 +32,7 @@ #include "KviLocale.h" #include "KviFileDialog.h" #include "kvi_fileextensions.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviTalHBox.h" #include "KviFileUtils.h" @@ -40,6 +40,7 @@ #include <QLayout> #include <QCursor> #include <QHeaderView> +#include <QWidgetAction> TextIconTableItem::TextIconTableItem(QTableWidget *,KviTextIcon * icon) : QTableWidgetItem(QString(),Qt::ItemIsEditable) @@ -152,10 +153,10 @@ void OptionsWidget_textIcons::doPopup() { if(!m_pPopup) { - m_pPopup = new KviTalPopupMenu(this); + m_pPopup = new QMenu(this); KviIconWidget * iw = new KviIconWidget(m_pPopup); connect(iw,SIGNAL(selected(KviIconManager::SmallIcon)),this,SLOT(iconSelected(KviIconManager::SmallIcon))); - m_pPopup->insertItem(iw); + m_pPopup->addAction(new QWidgetAction(iw)); } m_pPopup->popup(QCursor::pos()); } diff --git a/src/modules/options/OptionsWidget_textIcons.h b/src/modules/options/OptionsWidget_textIcons.h index 2d535cf65..cf4cb91e4 100644 --- a/src/modules/options/OptionsWidget_textIcons.h +++ b/src/modules/options/OptionsWidget_textIcons.h @@ -67,7 +67,7 @@ protected: QPushButton * m_pDel; QPushButton * m_pRestore; QToolButton * m_pCurrentIconButton; - KviTalPopupMenu *m_pPopup; + QMenu *m_pPopup; private: void fillTable(); public: diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp index 19ba52ef0..bb20859ff 100644 --- a/src/modules/popupeditor/PopupEditorWindow.cpp +++ b/src/modules/popupeditor/PopupEditorWindow.cpp @@ -184,7 +184,7 @@ SinglePopupEditor::SinglePopupEditor(QWidget * par) : QWidget(par) { m_pLastSelectedItem = 0; - m_pContextPopup = new KviTalPopupMenu(this); + m_pContextPopup = new QMenu(this); m_pClipboard = 0; m_pTestPopup = 0; @@ -380,85 +380,84 @@ void SinglePopupEditor::customContextMenuRequested(const QPoint &pos) bIsMenu = ((PopupTreeWidgetItem *)it)->m_type == PopupTreeWidgetItem::Menu; } - m_pContextPopup->insertItem(__tr2qs_ctx("New Separator Below","editor"),this,SLOT(contextNewSeparatorBelow())); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem(__tr2qs_ctx("New Separator Above","editor"),this,SLOT(contextNewSeparatorAbove())),it); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem(__tr2qs_ctx("New Separator Inside","editor"),this,SLOT(contextNewSeparatorInside())),it && bIsMenu); + m_pContextPopup->addAction(__tr2qs_ctx("New Separator Below","editor"),this,SLOT(contextNewSeparatorBelow())); + m_pContextPopup->addAction(__tr2qs_ctx("New Separator Above","editor"),this,SLOT(contextNewSeparatorAbove())) + ->setEnabled(it); + m_pContextPopup->addAction(__tr2qs_ctx("New Separator Inside","editor"),this,SLOT(contextNewSeparatorInside())) + ->setEnabled(it && bIsMenu); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - m_pContextPopup->insertItem(__tr2qs_ctx("New Label Below","editor"),this,SLOT(contextNewLabelBelow())); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem(__tr2qs_ctx("New Label Above","editor"),this,SLOT(contextNewLabelAbove())),it); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem(__tr2qs_ctx("New Label Inside","editor"),this,SLOT(contextNewLabelInside())),it && bIsMenu); + m_pContextPopup->addAction(__tr2qs_ctx("New Label Below","editor"),this,SLOT(contextNewLabelBelow())); + m_pContextPopup->addAction(__tr2qs_ctx("New Label Above","editor"),this,SLOT(contextNewLabelAbove())) + ->setEnabled(it); + m_pContextPopup->addAction(__tr2qs_ctx("New Label Inside","editor"),this,SLOT(contextNewLabelInside())) + ->setEnabled(it && bIsMenu); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - m_pContextPopup->insertItem(__tr2qs_ctx("New Item Below","editor"),this,SLOT(contextNewItemBelow())); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem(__tr2qs_ctx("New Item Above","editor"),this,SLOT(contextNewItemAbove())),it); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem(__tr2qs_ctx("New Item Inside","editor"),this,SLOT(contextNewItemInside())),it && bIsMenu); + m_pContextPopup->addAction(__tr2qs_ctx("New Item Below","editor"),this,SLOT(contextNewItemBelow())); + m_pContextPopup->addAction(__tr2qs_ctx("New Item Above","editor"),this,SLOT(contextNewItemAbove())) + ->setEnabled(it); + m_pContextPopup->addAction(__tr2qs_ctx("New Item Inside","editor"),this,SLOT(contextNewItemInside())) + ->setEnabled(it && bIsMenu); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - m_pContextPopup->insertItem(__tr2qs_ctx("New Menu Below","editor"),this,SLOT(contextNewMenuBelow())); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem(__tr2qs_ctx("New Menu Above","editor"),this,SLOT(contextNewMenuAbove())),it); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem(__tr2qs_ctx("New Menu Inside","editor"),this,SLOT(contextNewMenuInside())),it && bIsMenu); + m_pContextPopup->addAction(__tr2qs_ctx("New Menu Below","editor"),this,SLOT(contextNewMenuBelow())); + m_pContextPopup->addAction(__tr2qs_ctx("New Menu Above","editor"),this,SLOT(contextNewMenuAbove())) + ->setEnabled(it); + m_pContextPopup->addAction(__tr2qs_ctx("New Menu Inside","editor"),this,SLOT(contextNewMenuInside())) + ->setEnabled(it && bIsMenu); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - m_pContextPopup->insertItem(__tr2qs_ctx("New External Menu Below","editor"),this,SLOT(contextNewExtMenuBelow())); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem(__tr2qs_ctx("New External Menu Above","editor"),this,SLOT(contextNewExtMenuAbove())),it); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem(__tr2qs_ctx("New External Menu Inside","editor"),this,SLOT(contextNewExtMenuInside())),it && bIsMenu); + m_pContextPopup->addAction(__tr2qs_ctx("New External Menu Below","editor"),this,SLOT(contextNewExtMenuBelow())); + m_pContextPopup->addAction(__tr2qs_ctx("New External Menu Above","editor"),this,SLOT(contextNewExtMenuAbove())) + ->setEnabled(it); + m_pContextPopup->addAction(__tr2qs_ctx("New External Menu Inside","editor"),this,SLOT(contextNewExtMenuInside())) + ->setEnabled(it && bIsMenu); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Cut)), __tr2qs_ctx("Cu&t","editor"), - this,SLOT(contextCut())),it); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem( + this,SLOT(contextCut())) + ->setEnabled(it); + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Copy)), __tr2qs_ctx("&Copy","editor"), - this,SLOT(contextCopy())),it); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem( + this,SLOT(contextCopy())) + ->setEnabled(it); + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Paste)), - __tr2qs_ctx("&Paste Below","editor"),this,SLOT(contextPasteBelow())), - m_pClipboard); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem( + __tr2qs_ctx("&Paste Below","editor"),this,SLOT(contextPasteBelow())) + ->setEnabled(m_pClipboard); + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Paste)), - __tr2qs_ctx("Paste Above","editor"),this,SLOT(contextPasteAbove())),it && m_pClipboard); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem( + __tr2qs_ctx("Paste Above","editor"),this,SLOT(contextPasteAbove())) + ->setEnabled(it && m_pClipboard); + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Paste)), - __tr2qs_ctx("Paste Inside","editor"),this,SLOT(contextPasteInside())),it && bIsMenu && m_pClipboard); + __tr2qs_ctx("Paste Inside","editor"),this,SLOT(contextPasteInside())) + ->setEnabled(it && bIsMenu && m_pClipboard); bool bSeparatorInserted = false; // if(!findPrologue(parentMenu)) // { - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); bSeparatorInserted = true; - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Prologue)), __tr2qs_ctx("New Menu Prologue","editor"),this,SLOT(contextNewPrologue())); // } // if(!findEpilogue(parentMenu)) // { - if(!bSeparatorInserted)m_pContextPopup->insertSeparator(); - m_pContextPopup->insertItem( + if(!bSeparatorInserted)m_pContextPopup->addSeparator(); + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Epilogue)), __tr2qs_ctx("New Menu Epilogue","editor"),this,SLOT(contextNewEpilogue())); // } @@ -1053,8 +1052,8 @@ PopupEditorWidget::PopupEditorWidget(QWidget * par) m_bOneTimeSetupDone = false; m_pLastEditedItem = 0; - m_pContextPopup = new KviTalPopupMenu(this); - m_pEmptyContextPopup = new KviTalPopupMenu(this); + m_pContextPopup = new QMenu(this); + m_pEmptyContextPopup = new QMenu(this); spl->setStretchFactor (0,20); spl->setStretchFactor (1,80); @@ -1142,28 +1141,28 @@ void PopupEditorWidget::customContextMenuRequested(const QPoint &pos) { m_pContextPopup->clear(); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Popup)), __tr2qs_ctx("&New Popup","editor"), this,SLOT(newPopup())); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Quit)), __tr2qs_ctx("Re&move Popup","editor"), - this,SLOT(removeCurrentPopup())),it); + this,SLOT(removeCurrentPopup())) + ->setEnabled(it); - m_pContextPopup->setItemEnabled( - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("&Export Popup To...","editor"), - this,SLOT(exportCurrentPopup())),it); + this,SLOT(exportCurrentPopup())) + ->setEnabled(it); m_pContextPopup->popup(QCursor::pos()); } else { m_pEmptyContextPopup->clear(); - m_pEmptyContextPopup->insertItem( + m_pEmptyContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Popup)), __tr2qs_ctx("&New Popup","editor"), this,SLOT(newPopup())); diff --git a/src/modules/popupeditor/PopupEditorWindow.h b/src/modules/popupeditor/PopupEditorWindow.h index 2e31a96ad..98b5bb429 100644 --- a/src/modules/popupeditor/PopupEditorWindow.h +++ b/src/modules/popupeditor/PopupEditorWindow.h @@ -27,7 +27,7 @@ #include "KviWindow.h" #include "KviCString.h" #include <QTreeWidget> -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QWidget> #include <QLineEdit> @@ -83,7 +83,7 @@ protected: QLineEdit * m_pIconEditor; QLineEdit * m_pConditionEditor; QLineEdit * m_pExtNameEditor; - KviTalPopupMenu * m_pContextPopup; + QMenu * m_pContextPopup; public: void edit(MenuTreeWidgetItem * it); KviKvsPopupMenu * getMenu(); @@ -156,8 +156,8 @@ public: QTreeWidget * m_pTreeWidget; MenuTreeWidgetItem * m_pLastEditedItem; bool m_bOneTimeSetupDone; - KviTalPopupMenu * m_pContextPopup; - KviTalPopupMenu * m_pEmptyContextPopup; + QMenu * m_pContextPopup; + QMenu * m_pEmptyContextPopup; bool m_bSaving; public: void commit(); diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp index 6d3d67386..71755bfdf 100644 --- a/src/modules/raweditor/RawEditorWindow.cpp +++ b/src/modules/raweditor/RawEditorWindow.cpp @@ -40,7 +40,7 @@ #include "KviKvsEventManager.h" #include "KviKvsEventHandler.h" #include "KviTalVBox.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QMessageBox> #include <QSplitter> @@ -91,7 +91,7 @@ RawEditorWidget::RawEditorWidget(QWidget * par) m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection); // m_pTreeWidget->setShowSortIndicator(true); m_pTreeWidget->setRootIsDecorated(true); - m_pContextPopup = new KviTalPopupMenu(this); + m_pContextPopup = new QMenu(this); m_pTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu); connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *))); @@ -151,32 +151,32 @@ void RawEditorWidget::customContextMenuRequested(const QPoint &pos) if(it->parent()) { if(!(((RawHandlerTreeWidgetItem *)it)->m_bEnabled)) - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Handler)), __tr2qs_ctx("&Enable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled())); else - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::HandlerDisabled)), __tr2qs_ctx("&Disable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled())); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Quit)), __tr2qs_ctx("Re&move Handler","editor"), this,SLOT(removeCurrentHandler())); - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("&Export Handler To...","editor"), this,SLOT(exportCurrentHandler())); } else { - m_pContextPopup->insertItem( + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::Handler)), __tr2qs_ctx("&New Handler","editor"), this,SLOT(addHandlerForCurrentRaw())); } } - m_pContextPopup->insertSeparator(); - m_pContextPopup->insertItem( + m_pContextPopup->addSeparator(); + m_pContextPopup->addAction( *(g_pIconManager->getSmallIcon(KviIconManager::RawEvent)), __tr2qs_ctx("&Add Raw Event...","editor"), this,SLOT(addRaw())); diff --git a/src/modules/raweditor/RawEditorWindow.h b/src/modules/raweditor/RawEditorWindow.h index 81f45b3b0..7b547c8d9 100644 --- a/src/modules/raweditor/RawEditorWindow.h +++ b/src/modules/raweditor/RawEditorWindow.h @@ -33,7 +33,7 @@ #include <QLineEdit> class KviScriptEditor; -class KviTalPopupMenu; +class QMenu; class RawTreeWidget : public QTreeWidget { @@ -95,7 +95,7 @@ public: KviScriptEditor * m_pEditor; RawTreeWidget * m_pTreeWidget; QLineEdit * m_pNameEditor; - KviTalPopupMenu * m_pContextPopup; + QMenu * m_pContextPopup; RawHandlerTreeWidgetItem * m_pLastEditedItem; bool m_bOneTimeSetupDone; public: diff --git a/src/modules/reguser/RegisteredUserEntryDialog.h b/src/modules/reguser/RegisteredUserEntryDialog.h index 04dc745cd..96dafde06 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.h +++ b/src/modules/reguser/RegisteredUserEntryDialog.h @@ -29,7 +29,7 @@ #include "KviSelectors.h" #include "KviPointerHashTable.h" #include <QTreeWidget> -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <KviTalTabDialog.h> #include <QListWidget> diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp index 3b2f1c068..3cf8efcee 100644 --- a/src/modules/reguser/RegisteredUsersDialog.cpp +++ b/src/modules/reguser/RegisteredUsersDialog.cpp @@ -469,29 +469,29 @@ void RegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPoint RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)pItem; if(b->type()==RegisteredUsersDialogItemBase::User) { - KviTalPopupMenu *groups = new KviTalPopupMenu; + QMenu *groups = new QMenu; KviPointerHashTable<QString,KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict(); - m_TmpDict.clear(); for(KviPointerHashTableEntry<QString,KviRegisteredUserGroup> * g = pGroups->firstEntry();g;g = pGroups->nextEntry()) { - int id=groups->insertItem(g->key()); - m_TmpDict.replace(id,g->data()); + groups->addAction(g->key()) + ->setData(g->data()->name()); } - connect(groups,SIGNAL(activated ( int )),this,SLOT(moveToGroupMenuClicked(int))); + connect(groups,SIGNAL(triggered(QAction *)),this,SLOT(moveToGroupMenuClicked(QAction *))); - KviTalPopupMenu *mainPopup = new KviTalPopupMenu; - mainPopup->insertItem(__tr2qs_ctx("Move to group","register"),groups); + QMenu *mainPopup = new QMenu; + mainPopup->addAction(__tr2qs_ctx("Move to group","register"))->setMenu(groups); mainPopup->exec(pnt); } } } -void RegisteredUsersDialog::moveToGroupMenuClicked(int id) +void RegisteredUsersDialog::moveToGroupMenuClicked(QAction *pAction) { - QString szGroup=(*(m_TmpDict.find(id)))->name(); - QList<QTreeWidgetItem *> list = m_pListView->selectedItems(); + QString szGroup=pAction->data().toString(); + + QList<QTreeWidgetItem *> list = m_pListView->selectedItems(); for(int i=0; i<list.count(); i++) { RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(list.at(i)); diff --git a/src/modules/reguser/RegisteredUsersDialog.h b/src/modules/reguser/RegisteredUsersDialog.h index d511560dd..aed4768c2 100644 --- a/src/modules/reguser/RegisteredUsersDialog.h +++ b/src/modules/reguser/RegisteredUsersDialog.h @@ -30,13 +30,12 @@ #include "KviPointerHashTable.h" #include <QTreeWidget> #include "KviTalListWidget.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QWidget> #include <QLineEdit> #include <QPushButton> #include <QStyledItemDelegate> -#include <QMultiHash> #include <QTextDocument> class KviRegisteredUsersListView : public QTreeWidget @@ -132,7 +131,6 @@ public: QPushButton * m_pExportButton; QPushButton * m_pAddGroupButton; QPushButton * m_pSelectAllButton; - QMultiHash<int, KviRegisteredUserGroup*> m_TmpDict; protected: void fillList(); void editItem(RegisteredUsersDialogItem * i); @@ -153,7 +151,7 @@ protected slots: void itemPressed(QTreeWidgetItem *it,int c); void itemDoubleClicked(QTreeWidgetItem *it, int); void rightButtonPressed ( QTreeWidgetItem *, QPoint); - void moveToGroupMenuClicked(int); + void moveToGroupMenuClicked(QAction *pAction); }; #endif diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp index 2abdd3709..981a38b43 100644 --- a/src/modules/setup/SetupWizard.cpp +++ b/src/modules/setup/SetupWizard.cpp @@ -360,13 +360,13 @@ SetupWizard::SetupWizard() m_pAgeCombo = new QComboBox(hb); - m_pAgeCombo->insertItem(0,__tr2qs("Unspecified")); + m_pAgeCombo->insertItem(0,__tr2qs("Unspecified")); unsigned int i; for(i=1;i<120;i++) { QString tmp; tmp.setNum(i); - m_pAgeCombo->insertItem(m_pAgeCombo->count(),tmp); + m_pAgeCombo->insertItem(m_pAgeCombo->count(),tmp); } bool bOk; @@ -387,9 +387,9 @@ SetupWizard::SetupWizard() m_pGenderCombo = new QComboBox(hb); - m_pGenderCombo->insertItem(0,__tr2qs("Unspecified")); - m_pGenderCombo->insertItem(1,__tr2qs("Female")); - m_pGenderCombo->insertItem(2,__tr2qs("Male")); + m_pGenderCombo->insertItem(0,__tr2qs("Unspecified")); + m_pGenderCombo->insertItem(1,__tr2qs("Female")); + m_pGenderCombo->insertItem(2,__tr2qs("Male")); if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Male")) m_pGenderCombo->setCurrentIndex(2); diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp index dee47083d..75f4c80ae 100644 --- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp +++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp @@ -384,11 +384,11 @@ void SharedFilesWindow::transferUnregistering(KviSharedFiles * t) void SharedFilesWindow::rightButtonPressed(QTreeWidgetItem *it,const QPoint &pnt,int col) { - if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this); - if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this); + if(!m_pContextPopup)m_pContextPopup = new QMenu(this); + if(!m_pLocalFilePopup)m_pLocalFilePopup = new QMenu(this); if(!m_pOpenFilePopup) { - m_pOpenFilePopup= new KviTalPopupMenu(this); + m_pOpenFilePopup= new QMenu(this); connect(m_pOpenFilePopup,SIGNAL(activated(int)),this,SLOT(openFilePopupActivated(int))); } @@ -429,7 +429,7 @@ void SharedFilesWindow::rightButtonPressed(QTreeWidgetItem *it,const QPoint &pnt QLabel * l = new QLabel(tmp,m_pLocalFilePopup); QPalette p; m_pLabel->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name()); - m_pLocalFilePopup->insertItem(l); + m_pLocalFilePopup->addAction(l); #ifdef COMPILE_KDE_SUPPORT QString mimetype = KMimeType::findByPath(szFile)->name(); @@ -443,31 +443,31 @@ void SharedFilesWindow::rightButtonPressed(QTreeWidgetItem *it,const QPoint &pnt for(KServiceTypeProfile::OfferList::Iterator itOffers = offers.begin(); itOffers != offers.end(); ++itOffers) { - id = m_pOpenFilePopup->insertItem((*itOffers).service()->pixmap(KIcon::Small),(*itOffers).service()->name()); + id = m_pOpenFilePopup->addAction((*itOffers).service()->pixmap(KIcon::Small),(*itOffers).service()->name()); m_pOpenFilePopup->setItemParameter(id,idx); idx++; } - m_pOpenFilePopup->insertSeparator(); + m_pOpenFilePopup->addSeparator(); - id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("Default application","filetransferwindow"),this,SLOT(openLocalFile())); + id = m_pOpenFilePopup->addAction(__tr2qs_ctx("Default application","filetransferwindow"),this,SLOT(openLocalFile())); m_pOpenFilePopup->setItemParameter(id,-1); - id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("&Other...","filetransferwindow"),this,SLOT(openLocalFileWith())); + id = m_pOpenFilePopup->addAction(__tr2qs_ctx("&Other...","filetransferwindow"),this,SLOT(openLocalFileWith())); m_pOpenFilePopup->setItemParameter(id,-1); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open with","filetransferwindow"),m_pOpenFilePopup); - m_pLocalFilePopup->insertSeparator(); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open folder","filetransferwindow"),this,SLOT(openLocalFileFolder())); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Reach in terminal","filetransferwindow"),this,SLOT(openLocalFileTerminal())); - m_pLocalFilePopup->insertSeparator(); + m_pLocalFilePopup->addAction(__tr2qs_ctx("Open with","filetransferwindow"),m_pOpenFilePopup); + m_pLocalFilePopup->addSeparator(); + m_pLocalFilePopup->addAction(__tr2qs_ctx("Open folder","filetransferwindow"),this,SLOT(openLocalFileFolder())); + m_pLocalFilePopup->addAction(__tr2qs_ctx("Reach in terminal","filetransferwindow"),this,SLOT(openLocalFileTerminal())); + m_pLocalFilePopup->addSeparator(); #endif //COMPILE_KDE_SUPPORT - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Copy path to clipboard","filetransferwindow"),this,SLOT(copyLocalFileToClipboard())); + m_pLocalFilePopup->addAction(__tr2qs_ctx("Copy path to clipboard","filetransferwindow"),this,SLOT(copyLocalFileToClipboard())); - m_pContextPopup->insertItem(__tr2qs_ctx("Local file","filetransferwindow"),m_pLocalFilePopup); + m_pContextPopup->addAction(__tr2qs_ctx("Local file","filetransferwindow"),m_pLocalFilePopup); } i->transfer()->fillContextPopup(m_pContextPopup,col); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); } } @@ -484,10 +484,10 @@ void SharedFilesWindow::rightButtonPressed(QTreeWidgetItem *it,const QPoint &pnt item = (KviSharedFilesItem *)item->nextSibling(); } - id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear terminated","filetransferwindow"),this,SLOT(clearTerminated())); + id = m_pContextPopup->addAction(__tr2qs_ctx("Clear terminated","filetransferwindow"),this,SLOT(clearTerminated())); m_pContextPopup->setItemEnabled(id,bHaveTerminated); - id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear all","filetransferwindow"),this,SLOT(clearAll())); + id = m_pContextPopup->addAction(__tr2qs_ctx("Clear all","filetransferwindow"),this,SLOT(clearAll())); m_pContextPopup->setItemEnabled(id,it); m_pContextPopup->popup(pnt); diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp index e1becb2c4..a340385b6 100644 --- a/src/modules/theme/ThemeManagementDialog.cpp +++ b/src/modules/theme/ThemeManagementDialog.cpp @@ -47,7 +47,7 @@ #include "KviDynamicToolTip.h" #include "KviIconManager.h" #include "KviMessageBox.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviTalListWidget.h" @@ -237,7 +237,7 @@ ThemeManagementDialog::ThemeManagementDialog(QWidget * parent) // g->setSpacing(1); vBox->setAlignment(b,Qt::AlignRight); fillThemeBox(); - m_pContextPopup = new KviTalPopupMenu(this); + m_pContextPopup = new QMenu(this); if(g_rectManagementDialogGeometry.y() < 5) { @@ -328,8 +328,8 @@ void ThemeManagementDialog::contextMenuRequested(const QPoint & pos) { m_pListWidget->setCurrentItem(m_pListWidget->itemAt(pos)); m_pContextPopup->clear(); - 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->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Minus)),__tr2qs_ctx("&Remove Theme","theme"),this,SLOT(deleteTheme())); + m_pContextPopup->addAction(*(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/theme/ThemeManagementDialog.h b/src/modules/theme/ThemeManagementDialog.h index 0714050a2..c68e0f2af 100644 --- a/src/modules/theme/ThemeManagementDialog.h +++ b/src/modules/theme/ThemeManagementDialog.h @@ -27,7 +27,7 @@ #include "KviOptionsWidget.h" #include "KviPointerList.h" #include "KviTheme.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviTalWizard.h" #include "KviTalListWidget.h" @@ -70,7 +70,7 @@ protected: KviTalIconAndRichTextItemDelegate * m_pItemDelegate; KviTalListWidget * m_pListWidget; QLabel * m_pCurrentInstalledThemeLabel; - KviTalPopupMenu * m_pContextPopup; + QMenu * m_pContextPopup; QToolButton * m_pDeleteThemeButton; QToolButton * m_pPackThemeButton; #if defined(COMPILE_WEBKIT_SUPPORT) || defined(Q_MOC_RUN) diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index 7359d125a..91e45369c 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -41,13 +41,14 @@ #include "KviIrcConnectionUserInfo.h" #include "KviOptions.h" #include "KviIrcView.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include <QPixmap> #include <QPainter> #include <QTimer> #include <QEvent> #include <QRegExp> +#include <QWidgetAction> #include <stdlib.h> #include <time.h> @@ -70,7 +71,7 @@ KviTrayIconWidget::KviTrayIconWidget() : QSystemTrayIcon(g_pMainWindow), m_CurrentPixmap(ICON_SIZE,ICON_SIZE) { g_pTrayIcon = this; - m_pContextPopup = new KviTalPopupMenu(0); + m_pContextPopup = new QMenu(0); setContextMenu(m_pContextPopup); m_iConsoles = 0; @@ -86,12 +87,12 @@ KviTrayIconWidget::KviTrayIconWidget() g_pMainWindow->setTrayIcon(this); m_pTip = new KviDynamicToolTip(g_pMainWindow,"dock_tooltip"); - m_pAwayPopup = new KviTalPopupMenu(0); + m_pAwayPopup = new QMenu(0); m_pTitleLabel = new QLabel(__tr2qs("<b>KVIrc</b>"),m_pContextPopup); QPalette p; m_pTitleLabel->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name()); - m_pContextPopup->insertItem(m_pTitleLabel); + m_pContextPopup->addAction(new QWidgetAction(m_pTitleLabel)); m_pContextPopup->setWindowTitle(__tr2qs("Context")); m_pAwayMenuId = m_pContextPopup->addMenu(m_pAwayPopup); m_pAwayMenuId->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Away))); @@ -103,10 +104,10 @@ KviTrayIconWidget::KviTrayIconWidget() 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_pContextPopup->addSeparator(); m_pToggleFrame = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Raw)),__tr2qs("Hide/Show"),this,SLOT(toggleParentFrame())); - m_pContextPopup->insertSeparator(); + m_pContextPopup->addSeparator(); id = m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::TrayIcon)),__tr2qs("Un&dock"),this,SLOT(executeInternalCommand(bool))); id->setData(KVI_INTERNALCOMMAND_TRAYICON_HIDE); diff --git a/src/modules/trayicon/libkvitrayicon.h b/src/modules/trayicon/libkvitrayicon.h index 801bad625..4dc40c28d 100644 --- a/src/modules/trayicon/libkvitrayicon.h +++ b/src/modules/trayicon/libkvitrayicon.h @@ -35,7 +35,7 @@ class QPixmap; class QTimer; -class KviTalPopupMenu; +class QMenu; class KviDynamicToolTip; //class KviMainWindow; @@ -47,8 +47,8 @@ public: ~KviTrayIconWidget(); protected: KviDynamicToolTip * m_pTip; - KviTalPopupMenu * m_pContextPopup; - KviTalPopupMenu * m_pAwayPopup; + QMenu * m_pContextPopup; + QMenu * m_pAwayPopup; QLabel * m_pTitleLabel; QAction* m_pToggleFrame; diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index ae914f879..7778e4d72 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -36,7 +36,7 @@ #include "KviWindowListBase.h" #include "KviPointerList.h" #include "KviKvsEventManager.h" -#include "KviTalPopupMenu.h" +#include "QMenu.h" #include "KviWindow.h" #include "KviOptions.h" #include "KviQString.h" @@ -170,19 +170,19 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *) //m_pUrlList = new KviListView(this,"list"); KviConfigurationFile cfg(szConfigPath,KviConfigurationFile::Read); /* - KviTalPopupMenu *pop; + QMenu *pop; - pop = new KviTalPopupMenu(this); - pop->insertItem(__tr2qs("&Configure"),this,SLOT(config())); -// pop->insertItem(__tr2qs("&Help"),this,SLOT(help())); - pop->insertItem(__tr2qs("Clo&se"),this,SLOT(close_slot())); + pop = new QMenu(this); + pop->addAction(__tr2qs("&Configure"),this,SLOT(config())); +// pop->addAction(__tr2qs("&Help"),this,SLOT(help())); + pop->addAction(__tr2qs("Clo&se"),this,SLOT(close_slot())); pop->setTitle(__tr2qs("&Module")); m_pMenuBar->addMenu(pop); - pop = new KviTalPopupMenu(this); - pop->insertItem(__tr2qs("&Load"),this,SLOT(loadList())); - pop->insertItem(__tr2qs("&Save"),this,SLOT(saveList())); - pop->insertItem(__tr2qs("&Clear"),this,SLOT(clear())); + pop = new QMenu(this); + pop->addAction(__tr2qs("&Load"),this,SLOT(loadList())); + pop->addAction(__tr2qs("&Save"),this,SLOT(saveList())); + pop->addAction(__tr2qs("&Clear"),this,SLOT(clear())); pop->setTitle(__tr2qs("&List")); m_pMenuBar->addMenu(pop); */ @@ -317,11 +317,11 @@ void UrlDialog::dblclk_url(QTreeWidgetItem *item, int) void UrlDialog::popup(QTreeWidgetItem *item, const QPoint &point) { m_szUrl = item->text(0); - KviTalPopupMenu p(0,"menu"); - p.insertItem(__tr2qs("&Remove"),this,SLOT(remove())); -// p.insertItem(__tr2qs("&Find Text"),this,SLOT(findtext())); - p.insertSeparator(); - m_pListPopup = new KviTalPopupMenu(0,"list"); + QMenu p("menu", 0); + p.addAction(__tr2qs("&Remove"),this,SLOT(remove())); +// p.addAction(__tr2qs("&Find Text"),this,SLOT(findtext())); + p.addSeparator(); + m_pListPopup = new QMenu("list", 0); for(KviWindow *w=g_pMainWindow->windowList()->first();w;w=g_pMainWindow->windowList()->next()) { @@ -332,15 +332,15 @@ void UrlDialog::popup(QTreeWidgetItem *item, const QPoint &point) m_pListPopup->addAction(w->plainTextCaption()); } } - p.insertItem(__tr2qs("&Say to Window"),m_pListPopup); + p.addAction(__tr2qs("&Say to Window"))->setMenu(m_pListPopup); connect(m_pListPopup,SIGNAL(triggered(QAction *)), this, SLOT(sayToWin(QAction *))); p.exec(point); } void UrlDialog::contextMenu(const QPoint &point) { - KviTalPopupMenu p(0,"contextmenu"); - p.insertItem(__tr2qs("Configure"),this,SLOT(config())); + QMenu p("contextmenu", 0); + p.addAction(__tr2qs("Configure"),this,SLOT(config())); p.exec(point); } diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h index 90622ab4e..812473da3 100644 --- a/src/modules/url/libkviurl.h +++ b/src/modules/url/libkviurl.h @@ -75,7 +75,7 @@ public: ~UrlDialog(); private: KviTalMenuBar *m_pMenuBar; - KviTalPopupMenu *m_pListPopup; // dynamic popup menu + QMenu *m_pListPopup; // dynamic popup menu QString m_szUrl; // used to pass urls to sayToWin slot protected: QPixmap *myIconPtr(); |