diff --git a/src/plugins/FlashCookieManager/fcm_plugin.cpp b/src/plugins/FlashCookieManager/fcm_plugin.cpp index 9f28d3123..d27c58534 100644 --- a/src/plugins/FlashCookieManager/fcm_plugin.cpp +++ b/src/plugins/FlashCookieManager/fcm_plugin.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #if defined(Q_OS_WIN) || defined(Q_OS_OS2) #include @@ -121,6 +122,13 @@ void FCM_Plugin::showSettings(QWidget* parent) m_fcmDialog->showPage(2); } +void FCM_Plugin::populateExtensionsMenu(QMenu* menu) +{ + QAction* showFCM = new QAction(QIcon(":/flashcookiemanager/data/flash-cookie-manager.png"), tr("Flash Cookie Manager"), menu); + connect(showFCM, SIGNAL(triggered()), this, SLOT(showFlashCookieManager())); + menu->addAction(showFCM); +} + void FCM_Plugin::setFlashCookies(const QList &flashCookies) { m_flashCookies = flashCookies; @@ -383,7 +391,7 @@ QWidget* FCM_Plugin::createStatusBarIcon(BrowserWindow* mainWindow) icon->setCursor(Qt::PointingHandCursor); QPixmap p(":/flashcookiemanager/data/flash-cookie-manager.png"); icon->setPixmap(p.scaledToHeight(16)); - icon->setToolTip(tr("Show/Hide Flash Cookie Manager")); + icon->setToolTip(tr("Show Flash Cookie Manager")); connect(icon, SIGNAL(clicked(QPoint)), this, SLOT(showFlashCookieManager())); diff --git a/src/plugins/FlashCookieManager/fcm_plugin.h b/src/plugins/FlashCookieManager/fcm_plugin.h index efaae89a9..486e08214 100644 --- a/src/plugins/FlashCookieManager/fcm_plugin.h +++ b/src/plugins/FlashCookieManager/fcm_plugin.h @@ -61,6 +61,7 @@ public: QTranslator* getTranslator(const QString &locale); void showSettings(QWidget* parent = 0); + void populateExtensionsMenu(QMenu* menu); void setFlashCookies(const QList &flashCookies); QList flashCookies(); diff --git a/src/plugins/TabManager/tabmanagerplugin.cpp b/src/plugins/TabManager/tabmanagerplugin.cpp index aa59be9fc..729c4cc9a 100644 --- a/src/plugins/TabManager/tabmanagerplugin.cpp +++ b/src/plugins/TabManager/tabmanagerplugin.cpp @@ -28,6 +28,7 @@ #include #include #include +#include QString TabManagerPlugin::s_settingsPath; @@ -135,6 +136,17 @@ void TabManagerPlugin::showSettings(QWidget* parent) } } +void TabManagerPlugin::populateExtensionsMenu(QMenu* menu) +{ + if (m_controller->viewType() == TabManagerWidgetController::ShowAsWindow) { + QAction* showAction = m_controller->createMenuAction(); + showAction->setParent(menu); + showAction->setCheckable(false); + connect(showAction, SIGNAL(triggered()), m_controller, SLOT(raiseTabManager())); + menu->addAction(showAction); + } +} + void TabManagerPlugin::insertManagerWidget() { if (m_controller->viewType() == TabManagerWidgetController::ShowAsSideBar) { diff --git a/src/plugins/TabManager/tabmanagerplugin.h b/src/plugins/TabManager/tabmanagerplugin.h index 2dcc480e3..ce04815e7 100644 --- a/src/plugins/TabManager/tabmanagerplugin.h +++ b/src/plugins/TabManager/tabmanagerplugin.h @@ -49,6 +49,7 @@ public: QTranslator* getTranslator(const QString &locale); void showSettings(QWidget* parent = 0); + void populateExtensionsMenu(QMenu* menu); void removeManagerWidget();