svnno****@sourc*****
svnno****@sourc*****
2009年 8月 5日 (水) 22:55:20 JST
Revision: 2519 http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2519 Author: nogu Date: 2009-08-05 22:55:20 +0900 (Wed, 05 Aug 2009) Log Message: ----------- define ThreadTabWidget::contextMenuEvent Modified Paths: -------------- kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp kita/branches/KITA-KDE4/kita/src/threadtabwidget.h kita/branches/KITA-KDE4/kita/src/threadview.cpp kita/branches/KITA-KDE4/kita/src/threadview.h Modified: kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp 2009-08-05 12:51:45 UTC (rev 2518) +++ kita/branches/KITA-KDE4/kita/src/kitaui/tabwidgetbase.cpp 2009-08-05 13:55:20 UTC (rev 2519) @@ -133,45 +133,56 @@ /* private */ void TabWidgetBase::setupActions() { - actionCollection() ->associateWidget(this); + actionCollection()->associateWidget(this); - QString str = i18n("Configure Shortcuts..."); - KAction* tab_configkeys_action = actionCollection()->addAction("tab_configkeys"); - tab_configkeys_action->setText(str); - connect(tab_configkeys_action, SIGNAL(triggered()), this, SLOT(slotConfigureKeys())); + KAction* tabConfigkeysAction + = actionCollection()->addAction("tab_configkeys"); + tabConfigkeysAction->setText(str); + connect(tabConfigkeysAction, SIGNAL(triggered()), + this, SLOT(slotConfigureKeys())); - KAction* tab_nexttab_action = actionCollection()->addAction("tab_nexttab"); - tab_nexttab_action->setText(i18n("Activate Next Tab")); - tab_nexttab_action->setShortcut(KStandardShortcut::tabNext()); - connect(tab_nexttab_action, SIGNAL(triggered()), this, SLOT(slotNextTab())); + KAction* tabNexttabAction + = actionCollection()->addAction("tab_nexttab"); + tabNexttabAction->setText(i18n("Activate Next Tab")); + tabNexttabAction->setShortcut(KStandardShortcut::tabNext()); + connect(tabNexttabAction, SIGNAL(triggered()), this, SLOT(slotNextTab())); - KAction* tab_prevtab_action = actionCollection()->addAction("tab_prevtab"); - tab_prevtab_action->setText(i18n("Activate Previous Tab")); - tab_prevtab_action->setShortcut(KStandardShortcut::tabPrev()); - connect(tab_prevtab_action, SIGNAL(triggered()), this, SLOT(slotPrevTab())); + KAction* tabPrevtabAction = actionCollection()->addAction("tab_prevtab"); + tabPrevtabAction->setText(i18n("Activate Previous Tab")); + tabPrevtabAction->setShortcut(KStandardShortcut::tabPrev()); + connect(tabPrevtabAction, SIGNAL(triggered()), this, SLOT(slotPrevTab())); - KAction* tab_closetab_action = actionCollection()->addAction("tab_closetab"); - tab_closetab_action->setText(i18n("Close This Tab")); - tab_closetab_action->setShortcut(KStandardShortcut::close()); - connect(tab_closetab_action, SIGNAL(triggered()), this, SLOT(slotCloseCurrentTab())); + KAction* tabClosetabAction = actionCollection()->addAction("tab_closetab"); + tabClosetabAction->setText(i18n("Close This Tab")); + tabClosetabAction->setShortcut(KStandardShortcut::close()); + connect(tabClosetabAction, SIGNAL(triggered()), + this, SLOT(slotCloseCurrentTab())); - KAction* tab_closeothertab_action = actionCollection()->addAction("tab_closetotherab"); - tab_closeothertab_action->setText(i18n("Close Other Tabs")); - tab_closeothertab_action->setShortcut(KStandardShortcut::close()); - connect(tab_closeothertab_action, SIGNAL(triggered()), this, SLOT(slotCloseOtherTab())); + KAction* tabCloseothertabAction + = actionCollection()->addAction("tab_closetotherab"); + tabCloseothertabAction->setText(i18n("Close Other Tabs")); + tabCloseothertabAction->setShortcut(KStandardShortcut::close()); + connect(tabCloseothertabAction, SIGNAL(triggered()), + this, SLOT(slotCloseOtherTab())); - KAction* tab_closerighttab_action = actionCollection()->addAction("tab_closetrightab"); - tab_closerighttab_action->setText(i18n("Close Right Tabs")); - connect(tab_closerighttab_action, SIGNAL(triggered()), this, SLOT(slotCloseRightTab())); + KAction* tabCloserighttabAction + = actionCollection()->addAction("tab_closetrightab"); + tabCloserighttabAction->setText(i18n("Close Right Tabs")); + connect(tabCloserighttabAction, SIGNAL(triggered()), + this, SLOT(slotCloseRightTab())); - KAction* tab_closelefttab_action = actionCollection()->addAction("tab_closetleftab"); - tab_closelefttab_action->setText(i18n("Close Left Tabs")); - connect(tab_closelefttab_action, SIGNAL(triggered()), this, SLOT(slotCloseLeftTab())); + KAction* tabCloselefttabAction + = actionCollection()->addAction("tab_closetleftab"); + tabCloselefttabAction->setText(i18n("Close Left Tabs")); + connect(tabCloselefttabAction, SIGNAL(triggered()), + this, SLOT(slotCloseLeftTab())); - KAction* tab_closealltab_action = actionCollection()->addAction("tab_closealltab"); - tab_closealltab_action->setText(i18n("Close All Tabs")); - connect(tab_closealltab_action, SIGNAL(triggered()), this, SLOT(slotCloseAllTab())); + KAction* tabClosealltabAction + = actionCollection()->addAction("tab_closealltab"); + tabClosealltabAction->setText(i18n("Close All Tabs")); + connect(tabClosealltabAction, SIGNAL(triggered()), + this, SLOT(slotCloseAllTab())); } Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp 2009-08-05 12:51:45 UTC (rev 2518) +++ kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp 2009-08-05 13:55:20 UTC (rev 2519) @@ -12,10 +12,12 @@ #include <QtGui/QApplication> #include <QtGui/QClipboard> +#include <QtGui/QContextMenuEvent> #include <kaction.h> #include <kactioncollection.h> #include <klocale.h> +#include <kmenu.h> #include <kstandardaction.h> #include <kstandardshortcut.h> @@ -332,3 +334,20 @@ ThreadView * view = isThreadView(currentWidget()); if (view) view->slotDeleteButtonClicked(); } + +void ThreadTabWidget::contextMenuEvent(QContextMenuEvent* e) +{ + QList<QAction*> list = actionCollection()->actions(); + KMenu popup; + QAction* act; + foreach (act, list) { + popup.addAction(act); + } + QAction* action = popup.exec(e->globalPos()); + if (action) + action->trigger(); +/* KActionCollection * collection = client->actionCollection(); + KAction* action; + action = new KAction(i18n("goback anchor"), SmallIcon("idea"), KShortcut(), m_threadPart, SLOT(gobackAnchor()), collection, "goback_anchor"); + emit popupMenu(client, global, url, mimeType, mode);*/ // TODO +} Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidget.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadtabwidget.h 2009-08-05 12:51:45 UTC (rev 2518) +++ kita/branches/KITA-KDE4/kita/src/threadtabwidget.h 2009-08-05 13:55:20 UTC (rev 2519) @@ -46,6 +46,7 @@ private: void setupActions(); + void contextMenuEvent(QContextMenuEvent* e); public slots: void slotCopyText(); Modified: kita/branches/KITA-KDE4/kita/src/threadview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-08-05 12:51:45 UTC (rev 2518) +++ kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-08-05 13:55:20 UTC (rev 2519) @@ -233,13 +233,6 @@ searchCombo->addItem(searchCombo->currentText()); } -void ThreadView::slotPopupMenu(KXMLGUIClient* client, const QPoint& global, const KUrl& url, const QString& mimeType, mode_t mode) -{ -/* KActionCollection * collection = client->actionCollection(); - KAction* action; - action = new KAction(i18n("goback anchor"), SmallIcon("idea"), KShortcut(), m_threadPart, SLOT(gobackAnchor()), collection, "goback_anchor"); - emit popupMenu(client, global, url, mimeType, mode);*/ // TODO -} void ThreadView::setFont(const QFont& font) { Modified: kita/branches/KITA-KDE4/kita/src/threadview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadview.h 2009-08-05 12:51:45 UTC (rev 2518) +++ kita/branches/KITA-KDE4/kita/src/threadview.h 2009-08-05 13:55:20 UTC (rev 2519) @@ -79,8 +79,6 @@ protected slots: void slotDOMNodeActivated(const DOM::Node& node); - void slotPopupMenu(KXMLGUIClient*, const QPoint&, const KUrl&, - const QString&, mode_t); private: void insertSearchCombo(); @@ -122,8 +120,6 @@ void slotCloseButton(); signals: - void popupMenu(KXMLGUIClient*, const QPoint&, const KUrl&, - const QString&, mode_t); void showThreadCompleted(); /* to ThreadPart */ }; }